You can subscribe to this list here.
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(46) |
Jul
(37) |
Aug
(154) |
Sep
(140) |
Oct
(132) |
Nov
(104) |
Dec
(67) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
(113) |
Feb
(73) |
Mar
(102) |
Apr
(106) |
May
(114) |
Jun
(67) |
Jul
(116) |
Aug
(48) |
Sep
(108) |
Oct
(296) |
Nov
(56) |
Dec
(53) |
2010 |
Jan
(95) |
Feb
(31) |
Mar
(40) |
Apr
(12) |
May
(10) |
Jun
(27) |
Jul
(19) |
Aug
(81) |
Sep
(48) |
Oct
(45) |
Nov
(40) |
Dec
(7) |
2011 |
Jan
(16) |
Feb
(32) |
Mar
(55) |
Apr
(38) |
May
(24) |
Jun
(37) |
Jul
(12) |
Aug
(16) |
Sep
(97) |
Oct
(90) |
Nov
(101) |
Dec
(89) |
2012 |
Jan
(18) |
Feb
(2) |
Mar
(54) |
Apr
(69) |
May
(97) |
Jun
(131) |
Jul
(70) |
Aug
(48) |
Sep
(48) |
Oct
(119) |
Nov
(194) |
Dec
(60) |
2013 |
Jan
(73) |
Feb
(35) |
Mar
(42) |
Apr
(28) |
May
(7) |
Jun
(17) |
Jul
(27) |
Aug
(10) |
Sep
(38) |
Oct
(12) |
Nov
(4) |
Dec
(16) |
2014 |
Jan
(33) |
Feb
(37) |
Mar
(19) |
Apr
(3) |
May
(47) |
Jun
(26) |
Jul
(22) |
Aug
|
Sep
(10) |
Oct
(30) |
Nov
(24) |
Dec
(19) |
2015 |
Jan
(13) |
Feb
(16) |
Mar
(36) |
Apr
(19) |
May
(5) |
Jun
(5) |
Jul
(3) |
Aug
(11) |
Sep
(22) |
Oct
(7) |
Nov
(14) |
Dec
|
2016 |
Jan
|
Feb
(26) |
Mar
(13) |
Apr
(61) |
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
(27) |
Nov
(14) |
Dec
(21) |
2017 |
Jan
(30) |
Feb
(4) |
Mar
(3) |
Apr
(5) |
May
(69) |
Jun
(29) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <bma...@us...> - 2008-09-17 10:13:51
|
Revision: 3939 http://fudaa.svn.sourceforge.net/fudaa/?rev=3939&view=rev Author: bmarchan Date: 2008-09-17 10:13:59 +0000 (Wed, 17 Sep 2008) Log Message: ----------- modif property svn:eol-style Property Changed: ---------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/FudaaCourbeExample.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestBu.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestCartouche.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestFrameVolume.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestFudaaDjaFrame.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestHelp.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestIrregulier.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestJFudaaMaillage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestJProjectSave.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestMaillageIrregulier.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestMaille3D.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestModeleMaillage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestSigAttributes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestSimple.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestTextField.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestVag3D.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestVecteurs.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/fdico/TestFDicoChooser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/mv/TestJDebit.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/mv/TestJMvExport.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/mv/TestProfile.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/sinavi2/TestDureeField.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/sipor/EssaisResultatsSipor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/sipor/TestTextFieldMeters2.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/sipor/TestTextFieldsMeters.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/Test3D.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestExec.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestExecLinux.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestExportMapInfo.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestExportShapefile.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestImportImage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestJSave.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestJTrPostProject.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestMatisse.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestSave.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestTelemacCasViewer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestTrMaillage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TrTestPostWatchSerafin.java branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TrTestPostWatcherRubar.java Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/FudaaCourbeExample.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestBu.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestCartouche.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestFrameVolume.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestFudaaDjaFrame.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestHelp.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestIrregulier.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestJFudaaMaillage.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestJProjectSave.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestMaillageIrregulier.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestMaille3D.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestModeleMaillage.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestSigAttributes.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestSimple.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestTextField.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestVag3D.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/all/TestVecteurs.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/fdico/TestFDicoChooser.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/mv/TestJDebit.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/mv/TestJMvExport.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/mv/TestProfile.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/sinavi2/TestDureeField.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/sipor/EssaisResultatsSipor.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/sipor/TestTextFieldMeters2.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/sipor/TestTextFieldsMeters.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/Test3D.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestExec.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestExecLinux.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestExportMapInfo.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestExportShapefile.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestImportImage.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestJSave.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestJTrPostProject.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestMatisse.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestSave.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestTelemacCasViewer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TestTrMaillage.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TrTestPostWatchSerafin.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/test/org/fudaa/fudaa/tr/TrTestPostWatcherRubar.java ___________________________________________________________________ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bma...@us...> - 2008-09-17 09:13:40
|
Revision: 3936 http://fudaa.svn.sourceforge.net/fudaa/?rev=3936&view=rev Author: bmarchan Date: 2008-09-17 09:12:47 +0000 (Wed, 17 Sep 2008) Log Message: ----------- modif property svn:eol-style Modified Paths: -------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/hydro1d/CConversionHydraulique1dResultatsGeneraux.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DEcluseMaritime.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DEtudeNavigationMaritime.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DGare.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DOuvrageEntreGares.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/Serveur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/planification/DChronometre.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/planification/DInstants.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/DParametresReflux.java Property Changed: ---------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/albe/DCalculAlbe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/albe/DParametresAlbe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/albe/DResultatsAlbe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/albe/ServeurAlbe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ant/GenereUsine.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/association/DTableHachage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/boony/BoonyBase64.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/boony/BoonyDeserializerHandler.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/boony/BoonyDeserializerHandlerInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/boony/BoonyDeserializerHandlerOld.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/boony/BoonyInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/boony/BoonyLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/boony/BoonyXgzDeserializer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/boony/BoonyXgzSerializer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/boony/BoonyXmlDeserializer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/boony/BoonyXmlSerializer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/CalculExec.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/CalculExecBatch.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/CalculExecBatchCommon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/CalculExecDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/CalculLauncher.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/CalculLauncherAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/CalculListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/DCalcul.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/DParametres.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/calcul/DResultats.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/collection/DCollection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/collection/DTableau.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoArrayList.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoEnumType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoIntIterator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoPreferences.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoPreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoResource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/commun/ProgressionDodicoAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/commun/ProgressionTestAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/cubature/DCalculCubature.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/cubature/DParametresCubature.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/cubature/DResultatsCubature.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/cubature/ServeurCubature.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/curvi/DCalculCurvi.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/curvi/DParametresCurvi.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/curvi/DResultatsCurvi.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/curvi/PontCurvi.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/curvi/ServeurCurvi.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/diapre/DCalculDiapre.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/diapre/DParametresDiapre.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/diapre/DResultatsDiapre.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/diapre/ServeurDiapre.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoAnalyzer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasFileFormat.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasFileFormatAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasFileFormatDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasFileFormatVersion.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasFileFormatVersionAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasReader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasResult.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoCasWriter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoComponentVisitor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoComportValues.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoDataType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoDataTypeGenerate.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoDynamiqueGenerator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoEntite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoEntiteComparator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoEntiteFileState.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoEntiteGenerate.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoEntiteList.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoExec.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoFactory.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoGenerator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoKeyword.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoLanguage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoManager.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoModelAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoModelAbstractDyn.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParams.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParamsChangeState.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParamsChangeStateInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParamsChangeStateListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParamsInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParamsLinkedSource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParamsListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoParamsPrevalid.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoResource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dico/DicoVersionManager.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dimduc/DCalculDimduc.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dimduc/DParametresDimduc.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dimduc/DResultatsDimduc.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dimduc/ServeurDimduc.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/DCalculDunes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/DParametresDunes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/DResultatsDunes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/ServeurDunes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIFileFormat.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIReader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesMAIWriter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesVersionInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/AllFrontierIteratorInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DArete.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DElement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DMaillage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DNoeud.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DParametresCalcul.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DRegion.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/DTrou.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfComputeVolume.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfData.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfDataAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfDataElement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfDataInterpolationAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfDataNode.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfElement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfElementType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfElementVolume.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfFilter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfFilterNone.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfFilterSelectedElement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfFilterSelectedNode.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfFilterTime.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfFrontierInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfGridData.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfGridDataInterpolationValuesAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfGridInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfGridSource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfGridVolumeInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfIndexInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfIndexVisitor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfNeighborMesh.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfNode.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfNodeMutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfSegment.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfSegmentMutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/EfVoisinageFinderActivity.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/FileFormatGridVersion.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/FileFormatGridVersionAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EFGridArrayZ.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfDataStatisticEvaluator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfFoundSegment.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfFrontier.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGrid.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGridAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGridArray.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGridBathyAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGridDataDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGridDefaultAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGridGisAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGridMutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGridRedispatched.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGridSourceDefaut.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGridSourceMutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGridSourcesAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGridTranslate.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGridVolume.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfGridVolumeArray.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfLibImpl.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/EfRefinedGridAddedPt.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/impl/FrontierIteratorInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/interpolation/EfGridDataInterpolator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/interpolation/EfGridDataInterpolatorDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/interpolation/EfInterpolationGridSupportAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/interpolation/EfInterpolationTargetGridAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/interpolation/EfInterpolator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfComparator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfIndexRegular.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfIndexVisitorHashSet.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfIndexVisitorHashSetNode.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfIndexVisitorNearestElt.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfIndexVisitorNearestNode.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfIndexVisitorNodeSelect.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfIndexerActivity.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfIsoActivity.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfIsoActivitySearcher.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfIsoRestructuredGridActivity.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfIsoRestructuredGridResult.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfIsoResultDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfIsoResultInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfLineFlowrateResult.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfLineIntersection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfLineIntersectionI.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfLineIntersectionParent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfLineIntersectionsCorrectionActivity.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfLineIntersectionsCorrectionTester.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfLineIntersectionsResultsBuilder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfLineIntersectionsResultsDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfLineIntersectionsResultsI.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfLineIntersectionsResultsMng.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfLineIntersectorActivity.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfRefinementMiddleActivity.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/operation/EfRefinementMiddleResult.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/serviceDunes/Convertisseur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/ef/serviceDunes/DServiceDunes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/evenement/CObjetEventSenderSupport.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/evenement/DObjetEvent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/evenement/DObjetEventListenerSupport.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/evenement/ObjetEventListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/ByteBufferInputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/CsvDoubleReader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/DodicoBufferedReader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/DodicoLineNumberReader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/DodicoReader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileFormatSoftware.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/NativeBinaryInputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/NativeBinaryOutputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/NativeBinarySystem.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/NativeNIOHelper.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FileOpReadCharSimpleAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FileOpWriterCharSimpleAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranBinaryInputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranBinaryOutputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranDoubleReader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranDoubleReaderResult.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranDoubleReaderResultInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranDoubleWriter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranReader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/fortran/FortranWriter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geodesie/Ellipsoide.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geodesie/SysGeodesique.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geodesie/SysGeodesiqueLambert.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geodesie/SysGeodesiqueMercator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DBoite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGeometrie.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGrille.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGrilleIrreguliere.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGrilleReguliere.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DLineaire.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DLineaireFini.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPolyedre.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPolygone.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPolyligne.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPonctuel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPonctuelFini.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSpatial.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSpatialFini.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSpatialInfini.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSphere.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSurfaceComposee.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSurfacique.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSurfaciqueFini.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DTriangle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DVolumique.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DVolumiqueFini.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/SPointVecteur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2DLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2DNodalPropertyMixteChangeListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2DSiProfilListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcFrontierBlockAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcFrontierBlockInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcFrontierInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcFrontierMiddleInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcListenerDispatcher.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcManagerAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcManagerBlockAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcManagerBlockInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcManagerMiddleInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBoundary.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBoundaryCondition.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBoundaryMutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBoundaryTypeControllerInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dEvolutionFrontiereLiquide.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dEvolutionFrontiereLiquideMutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dEvolutionUseCounter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dEvolutionVariableMap.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dNodalPropertiesMngAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dNodalPropertiesMngI.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dNodalProperty.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dNodalPropertyMixte.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dNodalPropertyMixteMutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParallelogrammeData.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParallelogrammeDataAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParallelogrammeDataInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParallelogrammeManager.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParallelogrammeManagerInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParameters.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dProjectDispatcherListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dRegularGrid.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dRegularGridData.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dRegularGridDataInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dRegularGridInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dSIListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dSiSourceInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dSpatialPropertyAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dSpatialPropertyInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dTimeStepGroup.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dVariableProviderContainerInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dVariableProviderInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBcListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBcManager.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBordIndexGeneral.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBoundary.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBoundaryCondition.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBoundaryConditionMiddle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBoundaryConditionMiddleFriction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBoundaryConditionMutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxDicoModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxDicoVersion.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxElementImposedProperty.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxElementProperty.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxElementPropertyCourant2dMng.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxElementPropertyMngAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxElementPropertyMngListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxNodalPropertiesListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxNodalPropertiesMng.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxParameters.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxProjectDispatcherListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxSICourant2D.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxSolutionInitAdapterInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxSolutionInitialeInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxSourceInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxValue.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxValueCommonMutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxVarEltProvider.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/resource/H2dResource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2DRubarDicoCasFileFormatVersion.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2DRubarDicoModelTransport.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2DRubarDicoParams.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2DRubarDiffusionListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2DRubarDiffusionModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2DRubarFrictionListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2DRubarFrictionModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2DRubarSolutionsInitialesInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarAppInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarApportListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarApportSpatialMng.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarArete.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarBcListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarBcMng.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDTRResult.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDicoModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutesBathy.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutesDiffusion.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutesFrottement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutesIni.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutesListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutesMng.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarDonneesBrutesVisitorClient.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarElementProperty.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarElementPropertyAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarEvolution.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarGrid.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarGridAreteDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarGridAreteSource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarLimniListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarLimniMng.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarNumberFormatter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageContainer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElemBuilder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireApport.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireApportI.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireBreche.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireBrecheI.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireDeversoir.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireDeversoirI.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireTransfert.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageElementaireTransfertDebitI.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageI.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageMng.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarOuvrageTypeCreator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarParameters.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarProjectDispatcherListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarSI.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarTarageListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarTarageMng.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarTimeCondition.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarTimeConditionCommon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarTimeConditionInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarTimeConditionMutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/rubar/H2dRubarVF2MResultInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2DTelemacNodalPropertiesDelegate.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2DTelemacNodalPropertiesMngAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcManager.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterConcentration.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterElevation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterFactory.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterFlowrate.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterLiquidOption.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterSedimentEvol.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterTracer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterVelocity.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcParameterVelocityProfil.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBordParFrontiere.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBoundary.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBoundaryCondition.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBoundaryConditionMutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBoundaryMutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacCLElementSource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacCLSourceInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacDicoFileFormatVersion.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacDicoParams.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacEvolutionUsedListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacNodalPropListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacNodalProperties.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacParameters.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacProjectDispatcherListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSIProperties.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuil.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilContainer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilMng.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSeuilSiphonContainer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSiphonContainer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSiphonInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacSourceMng.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacTransient.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dtelemacSiphon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dtelemacSiponListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dBcType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dBoundaryHouleType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dBoundaryType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dBoundaryTypeCommon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dFileFormatType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dProjetType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dRefluxBoundaryType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dRefluxImpressionType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dResolutionMethodType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dResolutionSchemaType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dRubarBcTypeList.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dRubarBoundaryDefaultType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dRubarBoundaryFlowrateGroupType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dRubarBoundaryFlowrateType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dRubarBoundaryType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dRubarOuvrageRef.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dRubarOuvrageType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dRubarOuvrageTypeClient.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dRubarProjetType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dVariableTimeType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dVariableTransType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dVariableType.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dVariableTypeContainer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dVariableTypeCreated.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/DCalculHiswa.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/DParametresHiswa.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/DResultatsHiswa.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/HiswaWriter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/ServeurHiswa.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/ASCIIUCodeESCCharStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/HiswaParser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/HiswaParserConstants.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/HiswaParserTokenManager.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/ParseException.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/Token.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hiswa/parser/TokenMgrError.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique/DCaracteristique.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique/DConditionInitiale.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique/DConditionLimite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique/DHydraulique.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique/DNature.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique/DProprietePhysique.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique/DSollicitation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/CGlobal.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DBarragePrincipal.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DBief.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DCalculHydraulique1d.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DCasier.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DConditionsInitiales.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DDefinitionSections.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DDefinitionSectionsParSections.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DDefinitionSectionsParSeries.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DDefinitionSectionsParSeriesUnitaire.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DDescriptionVariable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DDonneesHydrauliques.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DEtude1d.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DExtremite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DHydraulique1d.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DInformationTemps.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DLaisse.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DLiaison.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DLigneEauInitiale.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DLigneEauPoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DLimite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DLoiHydraulique.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DMaillage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DNoeud.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DOptionsListing.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DOptionsListingTracer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DParametresGeneraux.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DParametresGenerauxCasier.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DParametresReprise.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DParametresResultats.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DParametresStockage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DParametresTailleMaxFichier.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DParametresTemporels.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DProfil.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DReseau.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DResultatsBief.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DResultatsBiefPasTemps.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DResultatsGeneraux.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DResultatsTemporelSpatial.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DResultatsTemporelSpatialBief.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DSectionCalculee.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DSectionCalculeePasTemps.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DSingularite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DSite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DZone.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DZoneFrottement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DZonePlanimetrage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/FichierInvalideException.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/Identifieur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/calageauto/DApportCrueCalageAuto.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/calageauto/DCalageAuto.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/calageauto/DCrueCalageAuto.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/calageauto/DMesureCrueCalageAuto.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/calageauto/DParametresCalageAuto.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/calageauto/DResultatsCalageAuto.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DCalageImage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DCaracteristiqueLiaison.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DChenalLiaison.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DGeometrieCasier.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DNuagePointsCasier.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DOrificeLiaison.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DPlanimetrageCasier.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DSeuilLiaison.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DSiphonLiaison.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DTopologieCasierCasier.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DTopologieLiaison.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/casier/DTopologieRiviereCasier.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiGeometrique.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiHydrogramme.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiLimniHydrogramme.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiLimnigramme.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiOuvertureVanne.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiRegulation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiSeuil.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiTarage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/loi/DLoiTracer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierMethodeOpt.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/EnumMetierTypeLit.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierApportCrueCalageAuto.java branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/metier/calageauto/MetierCalageAuto.java branches/FudaaModeleur_TC... [truncated message content] |
From: <bma...@us...> - 2008-09-17 08:52:35
|
Revision: 3935 http://fudaa.svn.sourceforge.net/fudaa/?rev=3935&view=rev Author: bmarchan Date: 2008-09-17 08:52:26 +0000 (Wed, 17 Sep 2008) Log Message: ----------- modif property svn:eol-style Modified Paths: -------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalque.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalque.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueImagePersistence.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePositionnementInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BGroupeCalque.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleLigneBrisee.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneDeplacementAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneRotationAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneZoomOnSelectedAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteDeplacement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorLigneBriseePanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorPanelInterface.java Property Changed: ---------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/ActionAnimationTreeSelection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimatedInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationAdapterInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationComposite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationOutputAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationOutputAvi.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationOutputAviMencoder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationOutputFlash.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationOutputGIF.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationOutputImage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationOutputInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationSourceAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationSourceInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationTask.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/animation/EbliAnimationVideoEditPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalque.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalqueModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalque.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueAffichage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueAffichageLegendProperties.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueCarte.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueCartouche.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueConfigureSectionAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueContextuel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueContextuelListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueDeplacementInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueDessin.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueDessinInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueDomaine.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueFormeInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueGrille.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueGrilleReguliere.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueIcone.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueImage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueImagePersistence.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueLegende.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueLegendeCustomizer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueLegendePanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueMaillage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueMaillageElement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePaletteInfo.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePersistenceGroupe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePersistenceInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePersistenceSingle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePolygone.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePolyligne.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePositionRelativePoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePositionRelativeSegment.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalquePositionnementInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueRepereInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueRosace.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueSaverGroup.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueSaverInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueSaverSingle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueSaverTargetInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueSectionConfigure.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueSegment.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueSelecteurTitleVisibleTarget.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueSelection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueSelectionInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueSuiviSourisInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueSymbole.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueTailleInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueTexte.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueTexteRelatifPoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueTexteRelatifSegment.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueVecteur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalqueVisitor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BControleurCalque.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BGroupeCalque.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BTransformationDomaine.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BVueCalque.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/CalqueGISTreeModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/CalqueGeometryVisitor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/CalqueGuiHelper.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/DefaultContextuelDelegator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/EbliAdapteurSuiviSouris.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/EbliFilleCalques.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/EbliFilleCalquesInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/FlecheGrilleData.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/FlecheScaleData.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/FormeEvent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/FormeEventListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/SelectionEvent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/SelectionEventModele.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/SelectionListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesConfigure.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesLineAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMulti.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMultiSpecial.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesTraceConfigure.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueCartouche.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueClickInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueClikInteractionListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueFleche.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueFlecheGrilleSection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueFlecheLegend.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueFlecheScaleSection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGrille.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueGrilleReguliere.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueImageRaster.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueMultiPoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalquePoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalquePolygone.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalquePolyligne.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueRepereInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueSegment.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueSelectionInteractionAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueSelectionInteractionMulti.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueSelectionInteractionSimple.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueSondeInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueSondeInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquePanelController.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliCalquesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliFilleCalques.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModelPointAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleDonnees.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleDonneesMulti.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleDonneesVide.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleDonnesAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleFleche.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleFlecheForGrille.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGeom.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleGrilleReguliere.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleImage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleImageRaster.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleLigneBrisee.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleMaillage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleMaillageElement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleMultiPoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModelePoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModelePolygone.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModelePolyligne.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleSegment.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleStatiqueImageRaster.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleStatiqueMaillageElement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZModeleStatiquePoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZScene.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZSelectionEvent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZSelectionListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZSelectionTableUpdater.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZSelectionTrace.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueActionInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueActionSonde.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueActionTable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueGISEditionAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/CalqueSelectionAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EbliCalqueActionTimeChooser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EbliCalqueActionVariableChooser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneDeplacementAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneRotationAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/SceneZoomOnSelectedAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/dessin/DeCarre.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/dessin/DeCercle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/dessin/DeCourbeFermee.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/dessin/DeEllipse.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/dessin/DeForme.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/dessin/DeLigneBrisee.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/dessin/DeMainLevee.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/dessin/DeMultiPoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/dessin/DePoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/dessin/DePolygone.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/dessin/DeRectangle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/dessin/DeTexte.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/dessin/DeTrait.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteDeplacement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEdition.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteEditionClientInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/BPaletteRotation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/EbliAtomicCoordinatesTableModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/EbliAtomicsEditorPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/EbliSingleGeomVisuPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/EbliSingleObjectEditorPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueDeplacement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueDeplacementPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueDeplacementTargetInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionGroup.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteractionTargetI.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueLigneBriseeEditable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueMultiPointEditable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalquePointEditable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttibutesContainer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttributesCreatorInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttributesDataI.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorLigneBriseePanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorPanelInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModelClassLayerFilter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleEditable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeEditable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModelePointEditable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModelePointEditableInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZSceneEditor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/find/CalqueFindActionAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/find/CalqueFindActionDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/find/CalqueFindComponentPolygone.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/find/CalqueFindExpression.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/find/CalqueFindFlecheExpression.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/find/CalqueFindPointExpression.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/BJava3DVersionTest.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/BPalettePanelInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/BToggleButton3States.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/CalqueLayout.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliActionAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliActionChangeState.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliActionGroup.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliActionInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliActionMap.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliActionPaletteAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliActionPaletteSpecAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliActionPaletteTreeModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliActionSimple.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliButtonTool.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliButtonYesNo.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliCalquesPreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliComponentFactory.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliEnum.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliFormatter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliFormatterInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliListModelLargeString.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliListeSelectionMulti.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliListeSelectionMultiInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliPaletteButton.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliPopupListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliPreferences.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliSelectedChangeListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliSelectionMode.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliSelectionState.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliTableInfoPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliTableInfoTarget.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliUIProperties.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/Erreur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/LineChoiceBorder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/commun/VecteurGenerique.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BConfigurableCommon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BConfigurableComposite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BConfigurableInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BConfigurableSectionInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BConfigurableSingleSection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BConfigurePalette.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BConfigurePaletteAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BConfigurePaletteTargetComposite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BConfigurePaletteTargetInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BConfigureSectionBuilder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BMolette.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BMoletteBeanInfo.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurAlpha.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurAncre.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurButton.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurCheckBox.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurColorChooser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurColorChooserBt.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurComposite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurCouleur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurCouleurBeanInfo.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurEpaisseurTrait.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurFont.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurIconModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurLineModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurList.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurListComboBox.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurListTarget.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurListTimeTarget.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurMolette.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurPlanCouleur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurProprieteBooleenne.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurReduitCouleur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurReduitFonte.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurReduitFonteNewVersion.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurReduitParametresGouraud.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurResolution.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurSlider.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurSpinner.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurTargetColorInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurTargetComposite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurTargetInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/controle/BSelecteurTextField.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGActionAxeRepereConfigure.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGActionInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGAxe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGAxeConfigureTarget.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGAxeHorizontal.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGAxeRepereConfigurator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGAxeVertical.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGComboBoxModelForX.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGConfigureActionPalette.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGCourbe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGCourbeChild.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGCourbeConfigureTarget.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGCourbeModelDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGCourbeSimple.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGCourbeSurfacePainter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGCourbeSurfacePainterConfigure.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGExportData.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGExporter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGFille.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGFillePanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGFillePanelAnimAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGFillePanelDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGFilleSimple.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGFilleTree.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGraphe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGrapheModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGrapheModelListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGrapheSimpleModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGrapheTreeModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGrapheTreeModelStatic.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGGroup.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGInteractionDeplacementPoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGInteractionSelection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGInteractionSuivi.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGInteractionZoom.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGInteractiveComponent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGListSimple.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGMarges.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGMultiCourbeTableModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGObject.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGObjectComparator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGObjectConfigureVisibleTarget.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGPaletteInfo.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGParent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGRepere.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGSelectionListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGSelectionState.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGSimpleTableCellEditor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGSimplificationAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGSpecificActions.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGTableAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGTableGraphePanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGTableModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGTransfoLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGTree.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGTreeCellRenderer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/courbe/EGVue.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/BDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/BDialogContent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/BDialogContentImprimable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/BFileChooser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/BInternalDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/BPanneauEditorAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/BPanneauNavigation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/IDialogInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/find/EbliFindActionAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/find/EbliFindActionInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/find/EbliFindComponent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/find/EbliFindComponentComposite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/find/EbliFindComponentDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/find/EbliFindComponentExpr.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/find/EbliFindComponentSonde.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/find/EbliFindDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/find/EbliFindExpressionComposite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/find/EbliFindExpressionContainerInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/find/EbliFindExpressionDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/find/EbliFindable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/find/EbliFindableItem.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/CollectionGrPoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrBoite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrContour.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrData.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrElement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrMaillage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrMaillageElement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrMorphisme.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrNoeud.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrObjet.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrPoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrPolygone.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrPolyligne.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrPositionRelativePoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrPositionRelativeSegment.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrSegment.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrSymbole.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrTriangle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrVecteur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrVolume.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/VecteurDoubleGrPoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/VecteurGrContour.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/VecteurGrElement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/VecteurGrNoeud.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/VecteurGrPoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/VecteurGrPolygone.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/VecteurGrPolyligne.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/VecteurGrPositionRelativePoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/VecteurGrPositionRelativeSegment.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/VecteurGrSegment.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/VecteurGrSymbole.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Aspect.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Axe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/BGraphe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/BGrapheComponentListPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/BGrapheComponentTableModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/BGrapheController.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/BGrapheEditeurAxes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/BGrapheInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/BGraphePersonnaliseur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Contrainte.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Courbe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/CourbeDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/CourbeModelAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/EbliFilleGraphe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/EbliFilleGrapheController.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Etiquette.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Graphe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/GrapheComponent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/GrapheComponentComparator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/GrapheInteractionSuiviSouris.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Lecteur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Marges.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Repartition.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/graphe/Valeur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliDjaFrame.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliFilleImprimable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliFillePrevisualisation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliMiseEnPageDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliMiseEnPagePanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliMiseEnPagePreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliPageFormat.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliPageable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliPageableDelegate.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliPrinter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/mathematiques/Fonctions.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/mathematiques/Matrice.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/mathematiques/MatriceHermite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteCouleur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteCouleurSimple.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteCouleurSimpleBeanInfo.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteCouleurSimpleCustomEditor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteCouleurSimplePropertyEditor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteForme.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteIcone.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteIconeSimple.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteInfo.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteInfoAbstractAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPalettePlage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPalettePlageAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPalettePlageCouleurChooser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPalettePlageDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPalettePlageDiscret.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPalettePlageInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPalettePlageLegende.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPalettePlageLegendeReduit.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPalettePlageListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPalettePlageProperties.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPalettePlageTarget.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteProprietesSurface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteSelecteurReduitCouleur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteTexture.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPaletteTrait.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPlage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPlageAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/BPlageDiscret.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/PaletteCouleur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/PaletteCouleurContinu.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/PaletteCouleurDiscontinu.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/PaletteCouleurRenderer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/PaletteCouleurRendererTitle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/PaletteEditAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/PaletteEditorPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/PaletteListEditor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/PaletteManager.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/PaletteManagerTableModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/PaletteRefreshPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/PaletteSelecteurCouleurPlage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/palette/PaletteTitleComparator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/AbstractCalque.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/AbstractVueCalque.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/BControleNavigation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/BControleRepereTexte.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/BTransformationBouton.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/BTransformationDomaine.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/BTransformationGlissiere.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/BTransformationMolette.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/BTransformationRepere.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/BTransformationTexte.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/BTransformationTexteSimple.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/CoordonneesEvent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/CoordonneesListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/RepereEvent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/RepereEventListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/RepereMouseKeyController.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/RepereMouseKeyTarget.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/repere/ZTransformationDomaine.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/ressource/EbliResource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/tableau/EbliFilleTableau.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/tableau/EbliGrapheValeur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/tableau/EbliUtilisateurEvaluateur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/tableau/EbliUtilisateurTableauModele.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/BParametresGouraud.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/BParametresGouraudCustomEditor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/BPlageInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/FiltreAttenuation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/FiltreDesaturation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/Gouraud.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/IPaletteCouleur.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/Trace3D.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceBox.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceGeometrie.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIcon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIconButton.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIconCellRenderer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIconChooser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIconImmutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIconModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIconModelImmutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIsoAvecPlage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIsoInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIsoLignes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIsoLignesAvecPlages.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIsoPlageInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIsoSurfaces.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceIsoSurfacesAvecPlages.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceLigne.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceLigneChooser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceLigneImmutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceLigneModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceLigneModelImmutable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceLigneVisuComponent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TracePoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceSurface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceTraitRenderer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BCalqueBoite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BCanvas3D.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BCanvas3DOffScreen.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BCartouche.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BChampVecteurs.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BEtiquette.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BGrille.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BGrilleIrreguliere.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BGrilleReguliere.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BGroupe.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BGroupeLumiere.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BGroupeStandard.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BGroupeVolume.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BImportVolume.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BLumiere.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BLumiereDirectionnelle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BNuagePoints.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BObjet2D.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BTriangles.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BUnivers.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BVolume.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/EbliFilleVue3D.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/VolumePreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/ZVue3DController.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/ZVue3DPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/ZVueAnimAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/common/BControleAffichageTarget.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/common/BControleLumiereTarget.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/common/BGrilleAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/common/BTextureTargetInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/common/BUniversInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/common/BVolumeAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/volume/... [truncated message content] |
From: <bma...@us...> - 2008-09-17 08:28:19
|
Revision: 3934 http://fudaa.svn.sourceforge.net/fudaa/?rev=3934&view=rev Author: bmarchan Date: 2008-09-17 08:28:29 +0000 (Wed, 17 Sep 2008) Log Message: ----------- modif property svn:eol-style Modified Paths: -------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/SWFConstants.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFSpriteTagTypes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFTagTypes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Sound.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/readers/MovieBuilder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/readers/TagParser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/sound/SoundStreamHead.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/writers/SWFTagDumper.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/writers/SWFTagTypesImpl.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/writers/TagWriter.java Property Changed: ---------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/SWFConstants.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFSpriteTagTypes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFTagTypes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Sound.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/readers/MovieBuilder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/readers/TagParser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/sound/SoundStreamHead.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/writers/SWFTagDumper.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/writers/SWFTagTypesImpl.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/writers/TagWriter.java Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/SWFConstants.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/SWFConstants.java 2008-09-16 22:10:48 UTC (rev 3933) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/SWFConstants.java 2008-09-17 08:28:29 UTC (rev 3934) @@ -56,7 +56,7 @@ public static final int TAG_DEFINEFONTINFO = 13; public static final int TAG_DEFINESOUND = 14; public static final int TAG_STARTSOUND = 15; - //??? + //??? public static final int TAG_DEFINEBUTTONSOUND = 17; public static final int TAG_SOUNDSTREAMHEAD = 18; public static final int TAG_SOUNDSTREAMBLOCK = 19; @@ -64,27 +64,27 @@ public static final int TAG_DEFINEBITSJPEG2 = 21; public static final int TAG_DEFINESHAPE2 = 22; public static final int TAG_DEFINEBUTTONCXFORM = 23; - public static final int TAG_PROTECT = 24; + public static final int TAG_PROTECT = 24; //??? - public static final int TAG_PLACEOBJECT2 = 26; + public static final int TAG_PLACEOBJECT2 = 26; //??? - public static final int TAG_REMOVEOBJECT2 = 28; + public static final int TAG_REMOVEOBJECT2 = 28; //??? public static final int TAG_DEFINESHAPE3 = 32; public static final int TAG_DEFINETEXT2 = 33; public static final int TAG_DEFINEBUTTON2 = 34; public static final int TAG_DEFINEBITSJPEG3 = 35; - public static final int TAG_DEFINEBITSLOSSLESS2 = 36; + public static final int TAG_DEFINEBITSLOSSLESS2 = 36; public static final int TAG_DEFINETEXTFIELD = 37; public static final int TAG_DEFINEQUICKTIMEMOVIE = 38; public static final int TAG_DEFINESPRITE = 39; - public static final int TAG_NAMECHARACTER = 40; + public static final int TAG_NAMECHARACTER = 40; public static final int TAG_SERIALNUMBER = 41; public static final int TAG_GENERATOR_TEXT = 42; - public static final int TAG_FRAMELABEL = 43; + public static final int TAG_FRAMELABEL = 43; //??? public static final int TAG_SOUNDSTREAMHEAD2 = 45; - public static final int TAG_DEFINEMORPHSHAPE = 46; + public static final int TAG_DEFINEMORPHSHAPE = 46; //??? public static final int TAG_DEFINEFONT2 = 48; public static final int TAG_TEMPLATECOMMAND = 49; Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/SWFConstants.java ___________________________________________________________________ Added: svn:eol-style + native Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFSpriteTagTypes.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFSpriteTagTypes.java 2008-09-16 22:10:48 UTC (rev 3933) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFSpriteTagTypes.java 2008-09-17 08:28:29 UTC (rev 3934) @@ -43,7 +43,7 @@ * Interface for passing SWF tag types that can be used in a movie or a sprite */ public interface SWFSpriteTagTypes extends SWFTags -{ +{ /** * Start/stop playing a sound */ @@ -55,10 +55,10 @@ * @param streamFormat must be SWFConstants.SOUND_FORMAT_ADPCM * @param playbackFrequency one of the SWFConstants.SOUND_FREQ_* constants * @param streamFrequency one of the SWFConstants.SOUND_FREQ_* constants - */ - public void tagSoundStreamHead( - int playbackFrequency, boolean playback16bit, boolean playbackStereo, - int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, + */ + public void tagSoundStreamHead( + int playbackFrequency, boolean playback16bit, boolean playbackStereo, + int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, int averageSampleCount ) throws IOException; /** @@ -67,12 +67,12 @@ * @param streamFormat one of the SWFConstants.SOUND_FORMAT_* constants * @param playbackFrequency one of the SWFConstants.SOUND_FREQ_* constants * @param streamFrequency one of the SWFConstants.SOUND_FREQ_* constants - */ - public void tagSoundStreamHead2( - int playbackFrequency, boolean playback16bit, boolean playbackStereo, - int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, + */ + public void tagSoundStreamHead2( + int playbackFrequency, boolean playback16bit, boolean playbackStereo, + int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, int averageSampleCount ) throws IOException; - + /** * @param soundData format-dependent sound data */ @@ -84,7 +84,7 @@ /** * @return SWFActions to receive actions - or null to skip the data - */ + */ public SWFActions tagDoAction() throws IOException; /** @@ -93,15 +93,15 @@ */ public SWFActions tagDoInitAction( int spriteId ) throws IOException; - public void tagFreeCharacter( int charId ) throws IOException; - + public void tagFreeCharacter( int charId ) throws IOException; + /** * @param cxform may be null */ - public void tagPlaceObject( int charId, int depth, Matrix matrix, AlphaTransform cxform ) throws IOException; + public void tagPlaceObject( int charId, int depth, Matrix matrix, AlphaTransform cxform ) throws IOException; - public void tagRemoveObject( int charId, int depth ) throws IOException; - + public void tagRemoveObject( int charId, int depth ) throws IOException; + /** * @param clipDepth < 1 if not relevant * @param charId < 1 if not relevant @@ -121,9 +121,10 @@ AlphaTransform cxform, int ratio, String name, - int clipActionFlags ) throws IOException; + int clipActionFlags ) throws IOException; - public void tagRemoveObject2( int depth ) throws IOException; + public void tagRemoveObject2( int depth ) throws IOException; + /** * Define the label for the current frame */ Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFSpriteTagTypes.java ___________________________________________________________________ Added: svn:eol-style + native Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFTagTypes.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFTagTypes.java 2008-09-16 22:10:48 UTC (rev 3933) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFTagTypes.java 2008-09-17 08:28:29 UTC (rev 3934) @@ -48,8 +48,8 @@ * Interface for passing SWF tag types. */ public interface SWFTagTypes extends SWFSpriteTagTypes -{ - +{ + /** * @param format one of the SWFConstants.SOUND_FORMAT_* constants * @param frequency one of the SWFConstants.SOUND_FREQ_* constants @@ -57,33 +57,33 @@ */ public void tagDefineSound( int id, int format, int frequency, boolean bits16, boolean stereo, - int sampleCount, byte[] soundData ) throws IOException; - + int sampleCount, byte[] soundData ) throws IOException; + /** * Define the sound for a button */ - public void tagDefineButtonSound( int buttonId, - int rollOverSoundId, SoundInfo rollOverSoundInfo, - int rollOutSoundId, SoundInfo rollOutSoundInfo, - int pressSoundId, SoundInfo pressSoundInfo, - int releaseSoundId, SoundInfo releaseSoundInfo ) + public void tagDefineButtonSound( int buttonId, + int rollOverSoundId, SoundInfo rollOverSoundInfo, + int rollOutSoundId, SoundInfo rollOutSoundInfo, + int pressSoundId, SoundInfo pressSoundInfo, + int releaseSoundId, SoundInfo releaseSoundInfo ) throws IOException; - + /** * @return SWFShape to receive shape info - or null to skip the data */ public SWFShape tagDefineShape( int id, Rect outline ) throws IOException; - + /** * @return SWFShape to receive shape info - or null to skip the data */ public SWFShape tagDefineShape2( int id, Rect outline ) throws IOException; - + /** * @return SWFShape to receive shape info - or null to skip the data */ public SWFShape tagDefineShape3( int id, Rect outline ) throws IOException; - + /** * @param buttonRecords contains ButtonRecord objects * @return SWFActions object (may be null) to receive button actions - there is @@ -92,48 +92,48 @@ */ public SWFActions tagDefineButton( int id, Vector buttonRecords ) throws IOException; - + public void tagButtonCXForm( int buttonId, ColorTransform transform ) throws IOException; - + /** * @param buttonRecord2s contains ButtonRecord2 objects * @return SWFActions object (may be null) to receive button actions - there may * be multiple action arrays - each one is conditional, using the * BUTTON2_* condition flags defined in SWFConstants.java * @see com.anotherbigidea.flash.structs.ButtonRecord2 - */ - public SWFActions tagDefineButton2( int id, - boolean trackAsMenu, + */ + public SWFActions tagDefineButton2( int id, + boolean trackAsMenu, Vector buttonRecord2s ) - throws IOException; + throws IOException; - public void tagSetBackgroundColor( Color color ) throws IOException; - + public void tagSetBackgroundColor( Color color ) throws IOException; + /** * The SWFVectors object returned will be called numGlyphs times to * pass the vector information for each glyph (each glyph is terminated * by calling SWFVectors.done() ) */ - public SWFVectors tagDefineFont( int id, int numGlyphs ) throws IOException; + public SWFVectors tagDefineFont( int id, int numGlyphs ) throws IOException; /** * @return SWFText object to receive the text style and glyph information - * this may be null if the info is not required - */ - public SWFText tagDefineText( int id, Rect bounds, Matrix matrix ) throws IOException; - + */ + public SWFText tagDefineText( int id, Rect bounds, Matrix matrix ) throws IOException; + /** * Allows alpha colors * @return SWFText object to receive the text style and glyph information - * this may be null if the info is not required - */ - public SWFText tagDefineText2( int id, Rect bounds, Matrix matrix ) throws IOException; - + */ + public SWFText tagDefineText2( int id, Rect bounds, Matrix matrix ) throws IOException; + /** * @param flags see FONT_* constants in SWFConstants.java */ public void tagDefineFontInfo( int fontId, String fontName, - int flags, int[] codes ) throws IOException; + int flags, int[] codes ) throws IOException; /** * @param flags see FONT_* constants in SWFConstants.java @@ -142,53 +142,53 @@ public void tagDefineFontInfo2( int fontId, String fontName, int flags, int[] codes, int languageCode ) throws IOException; - + /** * @param data must contain the header data - use the InputStream version * when using an external JPEG */ - public void tagDefineBitsJPEG2( int id, byte[] data ) throws IOException; - + public void tagDefineBitsJPEG2( int id, byte[] data ) throws IOException; + /** * @param jpegImage must be a baseline JPEG (not a progressive JPEG) */ - public void tagDefineBitsJPEG2( int id, InputStream jpegImage ) throws IOException; - + public void tagDefineBitsJPEG2( int id, InputStream jpegImage ) throws IOException; + /** * JPEG image data only - header/encoding data is in tagJPEGTables tag */ - public void tagDefineBits( int id, byte[] imageData ) throws IOException; - + public void tagDefineBits( int id, byte[] imageData ) throws IOException; + /** * Only one tag per SWF - holds common JPEG encoding data */ public void tagJPEGTables( byte[] jpegEncodingData ) throws IOException; - + /** * JPEG image and encoding data with alpha channel bitmap * @param alphaData is zlib compressed */ public void tagDefineBitsJPEG3( int id, byte[] imageData, byte[] alphaData ) throws IOException; - + /** * @param format one of the SWFConstants.BITMAP_FORMAT_n_BIT constants */ - public void tagDefineBitsLossless( int id, int format, int width, int height, - Color[] colors, byte[] imageData ) + public void tagDefineBitsLossless( int id, int format, int width, int height, + Color[] colors, byte[] imageData ) throws IOException; - + /** * @param format one of the SWFConstants.BITMAP_FORMAT_n_BIT constants */ - public void tagDefineBitsLossless2( int id, int format, int width, int height, - Color[] colors, byte[] imageData ) + public void tagDefineBitsLossless2( int id, int format, int width, int height, + Color[] colors, byte[] imageData ) throws IOException; - + /** * @param password may be null */ - public void tagProtect( byte[] password ) throws IOException; - + public void tagProtect( byte[] password ) throws IOException; + /** * @param flags see TEXTFIELD_* constants in SWFConstants.java */ @@ -199,11 +199,11 @@ int lineSpacing ) throws IOException; - public void tagDefineQuickTimeMovie( int id, String filename ) throws IOException; + public void tagDefineQuickTimeMovie( int id, String filename ) throws IOException; - public SWFTagTypes tagDefineSprite( int id ) throws IOException; + public SWFTagTypes tagDefineSprite( int id ) throws IOException; - public SWFShape tagDefineMorphShape( int id, Rect startBounds, Rect endBounds ) + public SWFShape tagDefineMorphShape( int id, Rect startBounds, Rect endBounds ) throws IOException; public SWFVectors tagDefineFont2( int id, int flags, String name, int numGlyphs, @@ -223,13 +223,13 @@ /** * In files produced by Generator... */ - public void tagSerialNumber( String serialNumber ) throws IOException; - + public void tagSerialNumber( String serialNumber ) throws IOException; + /** * In Generator templates. Data is not parsed. */ - public void tagGenerator( byte[] data ) throws IOException; - + public void tagGenerator( byte[] data ) throws IOException; + /** * In Generator templates. Data is not parsed. */ @@ -244,7 +244,7 @@ * In Generator templates. Data is not parsed. */ public void tagNameCharacter( byte[] data ) throws IOException; - + /** * In Generator templates. Data is not parsed. */ Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFTagTypes.java ___________________________________________________________________ Added: svn:eol-style + native Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Sound.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Sound.java 2008-09-16 22:10:48 UTC (rev 3933) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Sound.java 2008-09-17 08:28:29 UTC (rev 3934) @@ -45,7 +45,7 @@ public int format; public int frequency; public boolean is16bit; - public boolean isStereo; + public boolean isStereo; public int sampleCount; public byte[] soundData; @@ -54,7 +54,7 @@ this.format = format; this.frequency = frequency; this.is16bit = is16bit; - this.isStereo = isStereo; + this.isStereo = isStereo; this.sampleCount = sampleCount; this.soundData = soundData; } Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Sound.java ___________________________________________________________________ Added: svn:eol-style + native Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/readers/MovieBuilder.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/readers/MovieBuilder.java 2008-09-16 22:10:48 UTC (rev 3933) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/readers/MovieBuilder.java 2008-09-17 08:28:29 UTC (rev 3934) @@ -174,38 +174,38 @@ * SWFTagTypes interface */ public void tagShowFrame() throws IOException - { - //--complete the current frame + { + //--complete the current frame if( frame == null ) timeline.appendFrame(); - else frame = null; - } - + else frame = null; + } + protected Frame currentFrame() - { - if( frame == null ) frame = timeline.appendFrame(); + { + if( frame == null ) frame = timeline.appendFrame(); return frame; - } - + } + //--Tags yet to be implemented... public void tagDefineSound( int id, int format, int frequency, boolean bits16, boolean stereo, int sampleCount, byte[] soundData ) throws IOException {} - public void tagDefineButtonSound( int buttonId, - int rollOverSoundId, SoundInfo rollOverSoundInfo, - int rollOutSoundId, SoundInfo rollOutSoundInfo, - int pressSoundId, SoundInfo pressSoundInfo, - int releaseSoundId, SoundInfo releaseSoundInfo ) - throws IOException {} - public void tagStartSound( int soundId, SoundInfo info ) throws IOException {} - public void tagSoundStreamHead( - int playbackFrequency, boolean playback16bit, boolean playbackStereo, - int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, - int averageSampleCount ) throws IOException {} - public void tagSoundStreamHead2( - int playbackFrequency, boolean playback16bit, boolean playbackStereo, - int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, - int averageSampleCount ) throws IOException {} + public void tagDefineButtonSound( int buttonId, + int rollOverSoundId, SoundInfo rollOverSoundInfo, + int rollOutSoundId, SoundInfo rollOutSoundInfo, + int pressSoundId, SoundInfo pressSoundInfo, + int releaseSoundId, SoundInfo releaseSoundInfo ) + throws IOException {} + public void tagStartSound( int soundId, SoundInfo info ) throws IOException {} + public void tagSoundStreamHead( + int playbackFrequency, boolean playback16bit, boolean playbackStereo, + int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, + int averageSampleCount ) throws IOException {} + public void tagSoundStreamHead2( + int playbackFrequency, boolean playback16bit, boolean playbackStereo, + int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, + int averageSampleCount ) throws IOException {} public void tagSoundStreamBlock( byte[] soundData ) throws IOException {} public void tagSerialNumber( String serialNumber ) throws IOException {} public void tagGenerator( byte[] data ) throws IOException {} @@ -214,67 +214,67 @@ public void tagGeneratorFont( byte[] data ) throws IOException {} public void tagNameCharacter( byte[] data ) throws IOException {} public void tagDefineBits( int id, byte[] imageData ) throws IOException {} - public void tagJPEGTables( byte[] jpegEncodingData ) throws IOException {} + public void tagJPEGTables( byte[] jpegEncodingData ) throws IOException {} public void tagDefineBitsJPEG3( int id, byte[] imageData, byte[] alphaData ) throws IOException {} - public SWFActions tagDoInitAction( int spriteId ) throws IOException { return null; } - + public SWFActions tagDoInitAction( int spriteId ) throws IOException { return null; } + /** * SWFTagTypes interface */ - public SWFActions tagDoAction() throws IOException - { - Actions acts = currentFrame().actions( movie.getVersion() ); + public SWFActions tagDoAction() throws IOException + { + Actions acts = currentFrame().actions( movie.getVersion() ); - return acts; + return acts; } /** * SWFTagTypes interface */ - public SWFShape tagDefineShape( int id, Rect outline ) throws IOException - { + public SWFShape tagDefineShape( int id, Rect outline ) throws IOException + { Shape s = new Shape(); s.setBoundingRectangle( ((double)outline.getMinX()) / SWFConstants.TWIPS, ((double)outline.getMinY()) / SWFConstants.TWIPS, ((double)outline.getMaxX()) / SWFConstants.TWIPS, - ((double)outline.getMaxY()) / SWFConstants.TWIPS ); + ((double)outline.getMaxY()) / SWFConstants.TWIPS ); - saveSymbol( id, s ); + saveSymbol( id, s ); - return new ShapeBuilder( s ); + return new ShapeBuilder( s ); } - + /** * SWFTagTypes interface */ - public SWFShape tagDefineShape2( int id, Rect outline ) throws IOException + public SWFShape tagDefineShape2( int id, Rect outline ) throws IOException { Shape s = new Shape(); s.setBoundingRectangle( ((double)outline.getMinX()) / SWFConstants.TWIPS, ((double)outline.getMinY()) / SWFConstants.TWIPS, ((double)outline.getMaxX()) / SWFConstants.TWIPS, - ((double)outline.getMaxY()) / SWFConstants.TWIPS ); + ((double)outline.getMaxY()) / SWFConstants.TWIPS ); - saveSymbol( id, s ); + saveSymbol( id, s ); - return new ShapeBuilder( s ); + return new ShapeBuilder( s ); } - + /** * SWFTagTypes interface */ - public SWFShape tagDefineShape3( int id, Rect outline ) throws IOException - { + public SWFShape tagDefineShape3( int id, Rect outline ) throws IOException + { Shape s = new Shape(); s.setBoundingRectangle( ((double)outline.getMinX()) / SWFConstants.TWIPS, ((double)outline.getMinY()) / SWFConstants.TWIPS, ((double)outline.getMaxX()) / SWFConstants.TWIPS, - ((double)outline.getMaxY()) / SWFConstants.TWIPS ); + ((double)outline.getMaxY()) / SWFConstants.TWIPS ); - saveSymbol( id, s ); + saveSymbol( id, s ); - return new ShapeBuilder( s ); + return new ShapeBuilder( s ); } /** @@ -288,17 +288,17 @@ /** * SWFTagTypes interface */ - public void tagPlaceObject( int charId, int depth, - Matrix matrix, AlphaTransform cxform ) + public void tagPlaceObject( int charId, int depth, + Matrix matrix, AlphaTransform cxform ) throws IOException - { - Symbol s = getSymbol( charId ); - if( s == null ) return; + { + Symbol s = getSymbol( charId ); + if( s == null ) return; - timeline.setAvailableDepth( depth ); - Instance inst = currentFrame().placeSymbol( s, ( matrix != null ) ? new Transform(matrix): null, cxform ); + timeline.setAvailableDepth( depth ); + Instance inst = currentFrame().placeSymbol( s, ( matrix != null ) ? new Transform(matrix): null, cxform ); saveInstance( depth, inst ); - } + } /** * SWFTagTypes interface @@ -340,12 +340,12 @@ { //System.out.println( ">>> " + s ); } - + if( s == null ) { System.out.println( "Failed to find Symbol with id " + charId ); return null; - } + } if( name != null ) { @@ -397,29 +397,29 @@ /** * SWFTagTypes interface - */ + */ public void tagRemoveObject( int charId, int depth ) throws IOException { Instance inst = getInstance( depth ); if( inst == null ) return; - currentFrame().remove( inst ); + currentFrame().remove( inst ); } /** * SWFTagTypes interface - */ + */ public void tagRemoveObject2( int depth ) throws IOException { Instance inst = getInstance( depth ); if( inst == null ) return; - currentFrame().remove( inst ); + currentFrame().remove( inst ); } /** * SWFTagTypes interface - */ + */ public void tagSetBackgroundColor( Color color ) throws IOException { if( newMovie ) movie.setBackColor( color ); @@ -427,10 +427,10 @@ /** * SWFTagTypes interface - */ - public void tagFrameLabel( String label ) throws IOException + */ + public void tagFrameLabel( String label ) throws IOException { - tagFrameLabel( label, false ); + tagFrameLabel( label, false ); } /** @@ -444,7 +444,7 @@ /** * SWFTagTypes interface - */ + */ public SWFTagTypes tagDefineSprite( int id ) throws IOException { MovieClip _clip = new MovieClip(); @@ -455,19 +455,19 @@ /** * SWFTagTypes interface - */ + */ public void tagProtect( byte[] password ) throws IOException { - if( newMovie ) movie.protect( true ); - } + if( newMovie ) movie.protect( true ); + } /** * SWFTagTypes interface - */ + */ public void tagEnableDebug( byte[] password ) throws IOException { - //not implemented - } + //not implemented + } /** * SWFTagTypes interface @@ -479,15 +479,15 @@ /** * SWFTagTypes interface - */ + */ public SWFVectors tagDefineFont( int id, int numGlyphs ) throws IOException { - FontDefinition fontDef = new FontDefinition(); + FontDefinition fontDef = new FontDefinition(); Font font = new Font( fontDef ); saveSymbol( id, font ); - return new GlyphBuilder( fontDef, font, numGlyphs ); + return new GlyphBuilder( fontDef, font, numGlyphs ); } /** @@ -500,9 +500,9 @@ /** * SWFTagTypes interface - */ + */ public void defineFontInfo( int fontId, String fontName, int flags, int[] codes, int langCode ) - { + { Symbol s = getSymbol(fontId); if( s == null || !(s instanceof Font)) return; @@ -530,7 +530,7 @@ } font.setLanguageCode( langCode ); - } + } /** * SWFTagTypes interface */ @@ -541,7 +541,7 @@ /** * SWFTagTypes interface - */ + */ public SWFVectors tagDefineFont2( int id, int flags, String name, int numGlyphs, int ascent, int descent, int leading, int[] codes, int[] advances, Rect[] bounds, @@ -558,11 +558,11 @@ FontDefinition fontDef = new FontDefinition( name, ((double)ascent)/SWFConstants.TWIPS, - ((double)descent)/SWFConstants.TWIPS, - ((double)leading)/SWFConstants.TWIPS, - isUnicode, isShiftJIS, isAnsi, isItalic, + ((double)descent)/SWFConstants.TWIPS, + ((double)leading)/SWFConstants.TWIPS, + isUnicode, isShiftJIS, isAnsi, isItalic, isBold, hasMetrics); - + Font font = new Font( fontDef ); saveSymbol( id, font ); @@ -583,12 +583,12 @@ } } - return new GlyphBuilder( fontDef, font, codes, advances, bounds ); + return new GlyphBuilder( fontDef, font, codes, advances, bounds ); } /** * SWFTagTypes interface - */ + */ public void tagDefineTextField( int fieldId, String fieldName, String initialText, Rect boundary, int flags, AlphaColor textColor, int alignment, int fontId, int fontSize, @@ -633,30 +633,30 @@ /** * SWFTagTypes interface - */ + */ public SWFText tagDefineText( int id, Rect bounds, Matrix matrix ) throws IOException - { + { Text text = new Text( new Transform(matrix) ); - saveSymbol( id, text ); + saveSymbol( id, text ); - return new TextBuilder( text ); - } - + return new TextBuilder( text ); + } + /** * SWFTagTypes interface - */ + */ public SWFText tagDefineText2( int id, Rect bounds, Matrix matrix ) throws IOException { Text text = new Text( new Transform(matrix) ); - saveSymbol( id, text ); + saveSymbol( id, text ); - return new TextBuilder( text ); - } + return new TextBuilder( text ); + } /** * SWFTagTypes interface - */ + */ public SWFActions tagDefineButton( int id, Vector buttonRecords ) throws IOException { @@ -681,15 +681,15 @@ hit, up, down, over ); } - return new ButtonActionBuilder( but, movie.getVersion() ); + return new ButtonActionBuilder( but, movie.getVersion() ); } /** * SWFTagTypes interface - */ + */ public void tagButtonCXForm( int buttonId, ColorTransform transform ) throws IOException - { + { Symbol s = getSymbol( buttonId ); if( s == null || !(s instanceof Button )) return; @@ -704,16 +704,16 @@ layer.setColoring( new AlphaTransform( transform )); } - } + } /** * SWFTagTypes interface - */ - public SWFActions tagDefineButton2( int id, - boolean trackAsMenu, + */ + public SWFActions tagDefineButton2( int id, + boolean trackAsMenu, Vector buttonRecord2s ) throws IOException - { + { Button but = new Button( trackAsMenu ); saveSymbol( id, but ); @@ -735,11 +735,11 @@ hit, up, down, over ); } - return new ButtonActionBuilder( but, movie.getVersion() ); - } + return new ButtonActionBuilder( but, movie.getVersion() ); + } /** * SWFTagTypes interface - */ + */ public void tagExport( String[] names, int[] ids ) throws IOException { Symbol[] _symbols = new Symbol[ ids.length ]; @@ -754,7 +754,7 @@ /** * SWFTagTypes interface - */ + */ public void tagImport( String movieName, String[] names, int[] ids ) throws IOException { @@ -763,61 +763,61 @@ /** * SWFTagTypes interface - */ + */ public void tagDefineQuickTimeMovie( int id, String filename ) throws IOException - { + { saveSymbol( id, new QTMovie( filename ) ); - } + } /** * SWFTagTypes interface - */ + */ public void tagDefineBitsJPEG2( int id, byte[] data ) throws IOException - { + { saveSymbol( id, new Image.JPEG( data ) ); - } - + } + /** * SWFTagTypes interface - */ + */ public void tagDefineBitsJPEG2( int id, InputStream jpegImage ) throws IOException - { + { saveSymbol( id, new Image.JPEG( jpegImage ) ); } /** * SWFTagTypes interface - */ - public void tagDefineBitsLossless( int id, int format, int width, int height, - Color[] colors, byte[] imageData ) - throws IOException + */ + public void tagDefineBitsLossless( int id, int format, int width, int height, + Color[] colors, byte[] imageData ) + throws IOException { saveSymbol( id, new Image.Lossless( colors, imageData, ((double)width)/SWFConstants.TWIPS, ((double)height)/SWFConstants.TWIPS, - false, format )); + false, format )); } - + /** * SWFTagTypes interface - */ - public void tagDefineBitsLossless2( int id, int format, int width, int height, - Color[] colors, byte[] imageData ) - throws IOException + */ + public void tagDefineBitsLossless2( int id, int format, int width, int height, + Color[] colors, byte[] imageData ) + throws IOException { saveSymbol( id, new Image.Lossless( colors, imageData, ((double)width)/SWFConstants.TWIPS, ((double)height)/SWFConstants.TWIPS, - true, format )); + true, format )); } - + /** * SWFTagTypes interface - */ - public SWFShape tagDefineMorphShape( int id, Rect startBounds, Rect endBounds ) + */ + public SWFShape tagDefineMorphShape( int id, Rect startBounds, Rect endBounds ) throws IOException { - return new MorphShapeBuilder( id, startBounds, endBounds ); + return new MorphShapeBuilder( id, startBounds, endBounds ); } /** @@ -1011,11 +1011,11 @@ protected MorphShapeBuilder( int id, Rect startBounds, Rect endBounds ) { - super( new Shape() ); - this.id = id; - this.startBounds = startBounds; + super( new Shape() ); + this.id = id; + this.startBounds = startBounds; this.endBounds = endBounds; - } + } public void done() { Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/readers/MovieBuilder.java ___________________________________________________________________ Added: svn:eol-style + native Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/readers/TagParser.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/readers/TagParser.java 2008-09-16 22:10:48 UTC (rev 3933) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/readers/TagParser.java 2008-09-17 08:28:29 UTC (rev 3934) @@ -291,8 +291,8 @@ mTagtypes.tagFrameLabel( in.readString( mStringEncoding ) ); } - protected void parseDefineSound( InStream in ) throws IOException - { + protected void parseDefineSound( InStream in ) throws IOException + { int id = in.readUI16(); int format = (int)in.readUBits( 4 ); int frequency = (int)in.readUBits( 2 ); @@ -302,32 +302,31 @@ byte[] soundData = in.read(); mTagtypes.tagDefineSound( id, format, frequency, bits16, stereo, - sampleCount, soundData ); + sampleCount, soundData ); } - protected void parseStartSound( InStream in ) throws IOException - { + protected void parseStartSound( InStream in ) throws IOException + { int id = in.readUI16(); SoundInfo info = new SoundInfo( in ); - mTagtypes.tagStartSound( id, info ); + mTagtypes.tagStartSound( id, info ); } - protected void parseDefineButtonSound( InStream in ) throws IOException + protected void parseDefineButtonSound( InStream in ) throws IOException { int id = in.readUI16(); - int rollOverSoundId = in.readUI16(); + int rollOverSoundId = in.readUI16(); SoundInfo rollOverSoundInfo = (rollOverSoundId==0) ? null : new SoundInfo( in ); - int rollOutSoundId = in.readUI16(); + int rollOutSoundId = in.readUI16(); SoundInfo rollOutSoundInfo = (rollOutSoundId==0) ? null : new SoundInfo( in ); - int pressSoundId = in.readUI16(); + int pressSoundId = in.readUI16(); SoundInfo pressSoundInfo = (pressSoundId==0) ? null : new SoundInfo( in ); - int releaseSoundId = in.readUI16(); + int releaseSoundId = in.readUI16(); SoundInfo releaseSoundInfo = (releaseSoundId==0) ? null : new SoundInfo( in ); mTagtypes.tagDefineButtonSound( id, - rollOverSoundId, rollOverSoundInfo, - rollOutSoundId, rollOutSoundInfo, - pressSoundId, pressSoundInfo, + rollOverSoundId, rollOverSoundInfo, + rollOutSoundId, rollOutSoundInfo, + pressSoundId, pressSoundInfo, releaseSoundId, releaseSoundInfo ); - } protected void parseSoundStreamHead( boolean adpcmOnly, InStream in ) throws IOException { @@ -369,9 +368,9 @@ mTagtypes.tagSoundStreamBlock( in.read() ); } - protected void parseDefineBits( InStream in ) throws IOException + protected void parseDefineBits( InStream in ) throws IOException { - mTagtypes.tagDefineBits( in.readUI16(), in.read() ); + mTagtypes.tagDefineBits( in.readUI16(), in.read() ); } protected void parseDefineJPEGTables( InStream in ) throws IOException { Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/readers/TagParser.java ___________________________________________________________________ Added: svn:eol-style + native Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/sound/SoundStreamHead.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/sound/SoundStreamHead.java 2008-09-16 22:10:48 UTC (rev 3933) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/sound/SoundStreamHead.java 2008-09-17 08:28:29 UTC (rev 3934) @@ -44,47 +44,47 @@ { public int playbackFrequency; public boolean playback16bit; - public boolean playbackStereo; + public boolean playbackStereo; public int streamFormat; public int streamFrequency; public boolean stream16bit; - public boolean streamStereo; + public boolean streamStereo; public int averageSampleCount; - public SoundStreamHead( int playbackFrequency, boolean playback16bit, boolean playbackStereo, - int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, + public SoundStreamHead( int playbackFrequency, boolean playback16bit, boolean playbackStereo, + int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, int averageSampleCount ) { this.playbackFrequency = playbackFrequency; this.playback16bit = playback16bit; - this.playbackStereo = playbackStereo; + this.playbackStereo = playbackStereo; this.streamFormat = streamFormat; this.streamFrequency = streamFrequency; this.stream16bit = stream16bit; - this.streamStereo = streamStereo; + this.streamStereo = streamStereo; this.averageSampleCount = averageSampleCount; } /** * Playback and streaming parameters are assumed to be the same */ - public SoundStreamHead( int frequency, boolean is16bit, boolean isStereo, + public SoundStreamHead( int frequency, boolean is16bit, boolean isStereo, int streamFormat, int averageSampleCount ) { this.playbackFrequency = frequency; this.playback16bit = is16bit; - this.playbackStereo = isStereo; + this.playbackStereo = isStereo; this.streamFormat = streamFormat; this.streamFrequency = frequency; this.stream16bit = is16bit; - this.streamStereo = isStereo; + this.streamStereo = isStereo; this.averageSampleCount = averageSampleCount; } public void write( SWFSpriteTagTypes swfTags ) throws IOException { - swfTags.tagSoundStreamHead2( playbackFrequency, playback16bit, playbackStereo, - streamFormat, streamFrequency, stream16bit, streamStereo, + swfTags.tagSoundStreamHead2( playbackFrequency, playback16bit, playbackStereo, + streamFormat, streamFrequency, stream16bit, streamStereo, averageSampleCount ); } } Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/sound/SoundStreamHead.java ___________________________________________________________________ Added: svn:eol-style + native Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/writers/SWFTagDumper.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/writers/SWFTagDumper.java 2008-09-16 22:10:48 UTC (rev 3933) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/writers/SWFTagDumper.java 2008-09-17 08:28:29 UTC (rev 3934) @@ -157,69 +157,69 @@ /** * SWFTagTypes interface */ - public void tagStartSound( int soundId, SoundInfo info ) throws IOException + public void tagStartSound( int soundId, SoundInfo info ) throws IOException { - println( "start-sound id=" + soundId + " " + info ); + println( "start-sound id=" + soundId + " " + info ); } /** * SWFTagTypes interface */ - public void tagSoundStreamHead( - int playbackFrequency, boolean playback16bit, boolean playbackStereo, - int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, - int averageSampleCount ) throws IOException + public void tagSoundStreamHead( + int playbackFrequency, boolean playback16bit, boolean playbackStereo, + int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, + int averageSampleCount ) throws IOException { printSoundStreamHead( "sound-stream-head", - playbackFrequency, playback16bit, playbackStereo, - streamFormat, streamFrequency, stream16bit, streamStereo, - averageSampleCount ); + playbackFrequency, playback16bit, playbackStereo, + streamFormat, streamFrequency, stream16bit, streamStereo, + averageSampleCount ); } /** * SWFTagTypes interface */ - public void tagSoundStreamHead2( - int playbackFrequency, boolean playback16bit, boolean playbackStereo, - int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, - int averageSampleCount ) throws IOException + public void tagSoundStreamHead2( + int playbackFrequency, boolean playback16bit, boolean playbackStereo, + int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, + int averageSampleCount ) throws IOException { printSoundStreamHead( "sound-stream-head-2", - playbackFrequency, playback16bit, playbackStereo, - streamFormat, streamFrequency, stream16bit, streamStereo, - averageSampleCount ); + playbackFrequency, playback16bit, playbackStereo, + streamFormat, streamFrequency, stream16bit, streamStereo, + averageSampleCount ); } - public void printSoundStreamHead( String name, - int playbackFrequency, boolean playback16bit, boolean playbackStereo, - int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, - int averageSampleCount ) throws IOException - { + public void printSoundStreamHead( String name, + int playbackFrequency, boolean playback16bit, boolean playbackStereo, + int streamFormat, int streamFrequency, boolean stream16bit, boolean streamStereo, + int averageSampleCount ) throws IOException + { String playFreq = "5.5"; - if( playbackFrequency == SWFConstants.SOUND_FREQ_11KHZ ) playFreq = "11"; - if( playbackFrequency == SWFConstants.SOUND_FREQ_22KHZ ) playFreq = "22"; - if( playbackFrequency == SWFConstants.SOUND_FREQ_44KHZ ) playFreq = "44"; - + if( playbackFrequency == SWFConstants.SOUND_FREQ_11KHZ ) playFreq = "11"; + if( playbackFrequency == SWFConstants.SOUND_FREQ_22KHZ ) playFreq = "22"; + if( playbackFrequency == SWFConstants.SOUND_FREQ_44KHZ ) playFreq = "44"; + String streamFreq = "5.5"; - if( streamFrequency == SWFConstants.SOUND_FREQ_11KHZ ) streamFreq = "11"; - if( streamFrequency == SWFConstants.SOUND_FREQ_22KHZ ) streamFreq = "22"; - if( streamFrequency == SWFConstants.SOUND_FREQ_44KHZ ) streamFreq = "44"; - + if( streamFrequency == SWFConstants.SOUND_FREQ_11KHZ ) streamFreq = "11"; + if( streamFrequency == SWFConstants.SOUND_FREQ_22KHZ ) streamFreq = "22"; + if( streamFrequency == SWFConstants.SOUND_FREQ_44KHZ ) streamFreq = "44"; + String format = "RawSamples"; - if( streamFormat == SWFConstants.SOUND_FORMAT_ADPCM ) format = "ADPCM"; - if( streamFormat == SWFConstants.SOUND_FORMAT_MP3 ) format = "MP3"; + if( streamFormat == SWFConstants.SOUND_FORMAT_ADPCM ) format = "ADPCM"; + if( streamFormat == SWFConstants.SOUND_FORMAT_MP3 ) format = "MP3"; println( name + " play at " + playFreq + "kHz stereo=" + playbackStereo + " 16bit=" + playback16bit + " | Stream at " + streamFreq + "kHz format=" + format + " stereo=" + streamStereo + - " 16bit=" + stream16bit + " Avg-Samples=" + averageSampleCount ); + " 16bit=" + stream16bit + " Avg-Samples=" + averageSampleCount ); } - + /** * SWFTagTypes interface */ - public void tagSoundStreamBlock( byte[] soundData ) throws IOException + public void tagSoundStreamBlock( byte[] soundData ) throws IOException { println( "sound-stream-block" ); @@ -227,22 +227,22 @@ { Hex.dump( writer, soundData, 0L, indent + " ", false ); println( dashes ); - } - } - + } + } + /** * SWFTagTypes interface */ - public void tagSerialNumber( String serialNumber ) throws IOException + public void tagSerialNumber( String serialNumber ) throws IOException { - println( "serial number =" + serialNumber ); + println( "serial number =" + serialNumber ); } - - + + /** * SWFTagTypes interface */ - public void tagGenerator( byte[] data ) throws IOException + public void tagGenerator( byte[] data ) throws IOException { println( "generator tag" ); @@ -250,13 +250,13 @@ { Hex.dump( writer, data, 0L, indent + " ", false ); println( dashes ); - } - } - + } + } + /** * SWFTagTypes interface */ - public void tagGeneratorText( byte[] data ) throws IOException + public void tagGeneratorText( byte[] data ) throws IOException { println( "generator text" ); @@ -264,13 +264,13 @@ { Hex.dump( writer, data, 0L, indent + " ", false ); println( dashes ); - } + } } - + /** * SWFTagTypes interface */ - public void tagGeneratorFont( byte[] data ) throws IOException + public void tagGeneratorFont( byte[] data ) throws IOException { println( "generator font" ); @@ -278,13 +278,13 @@ { Hex.dump( writer, data, 0L, indent + " ", false ); println( dashes ); - } - } + } + } /** * SWFTagTypes interface */ - public void tagGeneratorCommand( byte[] data ) throws IOException + public void tagGeneratorCommand( byte[] data ) throws IOException { println( "generator command" ); @@ -292,13 +292,13 @@ { Hex.dump( writer, data, 0L, indent + " ", false ); println( dashes ); - } + } } /** * SWFTagTypes interface */ - public void tagNameCharacter( byte[] data ) throws IOException + public void tagNameCharacter( byte[] data ) throws IOException { println( "generator name character" ); @@ -306,13 +306,13 @@ { Hex.dump( writer, data, 0L, indent + " ", false ); println( dashes ); - } - } - + } + } + /** * SWFTagTypes interface */ - public void tagDefineBits( int id, byte[] imageData ) throws IOException + public void tagDefineBits( int id, byte[] imageData ) throws IOException { println( "jpeg bits" ); @@ -320,13 +320,13 @@ { Hex.dump( writer, imageData, 0L, indent + " ", false ); println( dashes ); - } - } - + } + } + /** * SWFTagTypes interface */ - public void tagJPEGTables( byte[] jpegEncodingData ) throws IOException + public void tagJPEGTables( byte[] jpegEncodingData ) throws IOException { println( "jpeg encoding data" ); @@ -334,13 +334,12 @@ { Hex.dump( writer, jpegEncodingData, 0L, indent + " ", false ); println( dashes ); - } + } } - /** * SWFTagTypes interface */ - public void tagDefineBitsJPEG3( int id, byte[] imageData, byte[] alphaData ) throws IOException + public void tagDefineBitsJPEG3( int id, byte[] imageData, byte[] alphaData ) throws IOException { println( "jpeg with alpha" ); @@ -350,7 +349,7 @@ println( "--- Alpha Channel follows ---" ); Hex.dump( writer, alphaData, 0L, indent + " ", false ); println( dashes ); - } + } } /** @@ -358,44 +357,44 @@ */ public void tagDefineSound( int id, int format, int frequency, boolean bits16, boolean stereo, - int sampleCount, byte[] soundData ) throws IOException - { + int sampleCount, byte[] soundData ) throws IOException + { String freq = "5.5"; - if( frequency == SWFConstants.SOUND_FREQ_11KHZ ) freq = "11"; - if( frequency == SWFConstants.SOUND_FREQ_22KHZ ) freq = "22"; - if( frequency == SWFConstants.SOUND_FREQ_44KHZ ) freq = "44"; - + if( frequency == SWFConstants.SOUND_FREQ_11KHZ ) freq = "11"; + if( frequency == SWFConstants.SOUND_FREQ_22KHZ ) freq = "22"; + if( frequency == SWFConstants.SOUND_FREQ_44KHZ ) freq = "44"; + String formatS = "RawSamples"; - if( format == SWFConstants.SOUND_FORMAT_ADPCM ) formatS = "ADPCM"; - if( format == SWFConstants.SOUND_FORMAT_MP3 ) formatS = "MP3"; - + if( format == SWFConstants.SOUND_FORMAT_ADPCM ) formatS = "ADPCM"; + if( format == SWFConstants.SOUND_FORMAT_MP3 ) formatS = "MP3"; - println( "define sound: id=" + id + " format=" + formatS + - " freq=" + freq + "kHz 16bit=" + bits16 + + + println( "define sound: id=" + id + " format=" + formatS + + " freq=" + freq + "kHz 16bit=" + bits16 + " stereo=" + stereo + " samples=" + sampleCount ); if( dumpHex ) { Hex.dump( writer, soundData, 0L, indent + " ", false ); println( dashes ); - } - } - + } + } + /** * SWFTagTypes interface */ - public void tagDefineButtonSound( int buttonId, - int rollOverSoundId, SoundInfo rollOverSoundInfo, - int rollOutSoundId, SoundInfo rollOutSoundInfo, - int pressSoundId, SoundInfo pressSoundInfo, - int releaseSoundId, SoundInfo releaseSoundInfo ) - throws IOException + public void tagDefineButtonSound( int buttonId, + int rollOverSoundId, SoundInfo rollOverSoundInfo, + int rollOutSoundId, SoundInfo rollOutSoundInfo, + int pressSoundId, SoundInfo pressSoundInfo, + int releaseSoundId, SoundInfo releaseSoundInfo ) + throws IOException { println( "define button sound: id=" + buttonId ); println( " roll-over sound=" + rollOverSoundId + " " + rollOverSoundInfo ); println( " roll-out sound=" + rollOutSoundId + " " + rollOutSoundInfo ); println( " press sound=" + pressSoundId + " " + pressSoundInfo ); - println( " release sound=" + releaseSoundId + " " + releaseSoundInfo ); + println( " release sound=" + releaseSoundId + " " + releaseSoundInfo ); } /** @@ -403,13 +402,13 @@ */ public void tagShowFrame() throws IOException { - println( "---------- frame ----------" ); - } + println( "---------- frame ----------" ); + } /** * SWFTagTypes interface */ - public SWFActions tagDoAction() throws IOException + public SWFActions tagDoAction() throws IOException { println( "actions:" ); @@ -429,34 +428,34 @@ acts.indent = " " + indent ; return acts; } - + /** * SWFTagTypes interface */ - public SWFShape tagDefineShape( int id, Rect outline ) throws IOException + public SWFShape tagDefineShape( int id, Rect outline ) throws IOException { println( "shape id=" + id + " " + outline ); - return this; + return this; } - + /** * SWFTagTypes interface ... [truncated message content] |
From: <de...@us...> - 2008-09-16 22:10:40
|
Revision: 3933 http://fudaa.svn.sourceforge.net/fudaa/?rev=3933&view=rev Author: deniger Date: 2008-09-16 22:10:48 +0000 (Tue, 16 Sep 2008) Log Message: ----------- maj animation Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionConfigure.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/WidgetConfigure.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/CalqueLegendeWidgetAdapter.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCalqueLegende.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeTableModel.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/TrCommonImplementation.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostMinMaxTableModel.java Added Paths: ----------- branches/Prepro-0.92-SNAPSHOT/dodico/test/org/fudaa/dodico/telemac/exemple2.res branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/animation/ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/animation/EbliWidgetAnimAdapter.java Property changes on: branches/Prepro-0.92-SNAPSHOT/dodico/test/org/fudaa/dodico/telemac/exemple2.res ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliScene.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -1,9 +1,18 @@ package org.fudaa.ebli.visuallibrary; +import java.awt.Dimension; +import java.awt.Graphics2D; import java.awt.Point; +import java.awt.Rectangle; +import java.awt.image.BufferedImage; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; import java.util.Collections; +import java.util.Map; import org.fudaa.ctulu.CtuluCommandManager; +import org.fudaa.ctulu.image.CtuluImageProducer; +import org.fudaa.ctulu.image.CtuluLibImage; import org.fudaa.ebli.visuallibrary.tree.EbliWidgetJXTreeTableModel; import org.netbeans.api.visual.action.SelectProvider; import org.netbeans.api.visual.graph.GraphScene; @@ -16,14 +25,55 @@ * * @author Adrien Hadoux */ -public class EbliScene extends GraphScene<EbliNode, EbliEdge> { +public class EbliScene extends GraphScene<EbliNode, EbliEdge> implements CtuluImageProducer { /** * model de la scene pour l affichage de ses composants */ EbliWidgetJXTreeTableModel treeModel_; + final PropertyChangeSupport propertyChangeSupport_ = new PropertyChangeSupport(this); + /** + * @param _listener le listener: a chaque fois le parametre new correspond au widget modifie + */ + public void addPropertyChangeListener(PropertyChangeListener _listener) { + propertyChangeSupport_.addPropertyChangeListener(_listener); + } + + /** + * @param _propertyName + * @param _listener + * @see java.beans.PropertyChangeSupport#addPropertyChangeListener(java.lang.String, + * java.beans.PropertyChangeListener) + */ + public void addPropertyChangeListener(String _propertyName, PropertyChangeListener _listener) { + propertyChangeSupport_.addPropertyChangeListener(_propertyName, _listener); + } + + /** + * @param _listener + * @see java.beans.PropertyChangeSupport#removePropertyChangeListener(java.beans.PropertyChangeListener) + */ + public void removePropertyChangeListener(PropertyChangeListener _listener) { + propertyChangeSupport_.removePropertyChangeListener(_listener); + } + + protected void firePropertyChange(Object _nodeOrEdge, String _property) { + propertyChangeSupport_.firePropertyChange(_property, null, _nodeOrEdge); + } + + /** + * @param _propertyName + * @param _listener + * @see java.beans.PropertyChangeSupport#removePropertyChangeListener(java.lang.String, + * java.beans.PropertyChangeListener) + */ + public void removePropertyChangeListener(String _propertyName, PropertyChangeListener _listener) { + propertyChangeSupport_.removePropertyChangeListener(_propertyName, _listener); + } + + /** * controller de la scene qui gere les actions et les constructions graphiques */ private EbliSceneController controller_; @@ -89,6 +139,38 @@ } + public Dimension getDefaultImageDimension() { + Rectangle rec = getBounds(); + Dimension d = new Dimension(); + d.height = rec.height; + d.width = rec.width; + return d; + } + + public BufferedImage produceImage(final Map _params) { + Dimension d = getDefaultImageDimension(); + return produceImage(d.width, d.height, _params); + } + + public BufferedImage produceImage(final int _w, final int _h, final Map _params) { + Dimension d = getDefaultImageDimension(); + final BufferedImage i = CtuluLibImage.createImage(_w, _h, _params); + final Graphics2D g = i.createGraphics(); + CtuluLibImage.setBestQuality(g); + if (_w != d.width || _h != d.height) { + g.scale(CtuluLibImage.getRatio(_w, d.width), CtuluLibImage.getRatio(_h, d.height)); + } + if (CtuluLibImage.mustFillBackground(_params)) { + g.setPaint(getBackground()); + g.fillRect(0, 0, d.width, d.height); + } + paint(g); + g.dispose(); + i.flush(); + return i; + + } + @Override protected void attachEdgeSourceAnchor(EbliEdge edge, EbliNode oldSourceNode, EbliNode sourceNode) { Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -7,11 +7,14 @@ import java.util.HashMap; import java.util.Map; +import org.fudaa.ctulu.CtuluCommand; import org.fudaa.ctulu.CtuluCommandContainer; import org.fudaa.ctulu.CtuluLibString; +import org.fudaa.ebli.animation.EbliAnimatedInterface; import org.fudaa.ebli.commun.EbliLib; import org.fudaa.ebli.controle.BConfigurableComposite; import org.fudaa.ebli.controle.BConfigurableInterface; +import org.fudaa.ebli.controle.BSelecteurCheckBox; import org.fudaa.ebli.controle.BSelecteurTargetInterface; import org.fudaa.ebli.trace.TraceLigneModel; import org.fudaa.ebli.visuallibrary.actions.CommandeUndoRedoGraphicalProperties; @@ -51,9 +54,6 @@ private EbliScene scene_; private boolean useBorder_ = true; - - - /** * @param scene @@ -185,6 +185,8 @@ * graphiques de la widget. */ public Object getProperty(String _key) { + if ("title".equals(_key)) return getTitle(); + if (BSelecteurCheckBox.PROP_VISIBLE.equals(_key)) return Boolean.valueOf(isVisible()); // -- cas particulier si il s agit de la rotation --// // -- il faut transformer les degres en radian --// @@ -236,6 +238,7 @@ return isGroup; } + @Override public boolean isHitAt(Point localLocation) { if (localLocation == null) return false; @@ -269,6 +272,13 @@ } /** + * @return une interface non null si la widget peut etre animee + */ + public EbliAnimatedInterface getAnimatedInterface() { + return null; + } + + /** * Methode qui raffraichis les proprietes de la widget. */ public final void refreshMyProperties() { @@ -277,9 +287,8 @@ public void removePropertyChangeListener(String _key, PropertyChangeListener _l) {} - public void removePropertyChangeListenerFormWidget(EbliWidget _widget) { - } - + public void removePropertyChangeListenerFormWidget(EbliWidget _widget) {} + public void setColorContour(Color newColor) { propGraphique.put(COLORCONTOUR, newColor); } @@ -290,7 +299,7 @@ public void setController(EbliWidgetController controller_) { this.controller_ = controller_; - + } public void setFormeFont(Font newFont) { @@ -308,16 +317,65 @@ * Methode directement appelee apres modification des parametres renvoye par le getproperty. Ajoute les anciens * parametres dans la commande undo/redo. */ - public final boolean setProperty(String _key, Object prop) { + public final boolean setProperty(final String _property, final Object _newVlaue) { + if ("title".equals(_property)) { return changeTitle((String) _newVlaue, true); } + if (BSelecteurCheckBox.PROP_VISIBLE.equals(_property)) { return changeVisible(((Boolean) _newVlaue).booleanValue(), + true); } // --cas particulier si il s agit du tracelignemodel: il faut mettre a jour // l ancien lignemodel --// - setPropertyCmd(_key, prop, getEbliScene().getCmdMng()); + setPropertyCmd(_property, _newVlaue, getEbliScene().getCmdMng()); return true; } - protected void setPropertyCmd(String _key, Object prop, CtuluCommandContainer _cmd) { + private boolean changeVisible(final boolean _newValue, boolean _cmd) { + if (_newValue == isVisible()) return false; + setVisible(_newValue); + getEbliScene().firePropertyChange(EbliWidget.this, BSelecteurCheckBox.PROP_VISIBLE); + if (_cmd) getEbliScene().getCmdMng().addCmd(new CtuluCommand() { + + public void undo() { + changeVisible(!_newValue, false); + } + + public void redo() { + changeVisible(_newValue, false); + } + }); + return true; + } + + private boolean changeTitle(final String _title, boolean _cmd) { + final String old = getTitle(); + if (_title != null && !_title.equals(old)) { + final EbliNode n = (EbliNode) getEbliScene().findObject(this); + if (n == null) return false; + n.setTitle(_title); + getEbliScene().firePropertyChange(EbliWidget.this, "title"); + if (_cmd) { + + getEbliScene().getCmdMng().addCmd(new CtuluCommand() { + public void undo() { + changeTitle(old, false); + } + + public void redo() { + changeTitle(_title, false); + } + }); + } + return true; + + } + return false; + + } + + protected void setPropertyCmd(String _property, Object _newValue, CtuluCommandContainer _cmd) { + Object old = propGraphique.get(_property); + if (old == _newValue || (old != null && old.equals(_newValue))) return; + CommandeUndoRedoGraphicalProperties undoRedo = null; if (_cmd != null) { undoRedo = new CommandeUndoRedoGraphicalProperties(); @@ -327,15 +385,16 @@ undoRedo.addOldPropertie(this.duplicateGraphicalProperties()); _cmd.addCmd(undoRedo); } - if (_key.equals(LINEMODEL)) { - getTraceLigneModel().updateData((TraceLigneModel) prop); - prop = getTraceLigneModel(); - } else if (_key.equals(ROTATION) && prop instanceof Integer) { - prop = new Double(Math.toRadians(((Integer) prop).intValue())); + if (_property.equals(LINEMODEL)) { + getTraceLigneModel().updateData((TraceLigneModel) _newValue); + _newValue = getTraceLigneModel(); + } else if (_property.equals(ROTATION) && _newValue instanceof Integer) { + _newValue = new Double(Math.toRadians(((Integer) _newValue).intValue())); } // --mise a jout de la map de proprietes --// - propGraphique.put(_key, prop); + propGraphique.put(_property, _newValue); + getEbliScene().firePropertyChange(this, _property); if (undoRedo != null) { // -- ajout de la nouvelle propertie --// undoRedo.addNewPropertie(propGraphique); Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -5,6 +5,7 @@ import java.util.Map; import org.fudaa.ctulu.CtuluCommandContainer; +import org.fudaa.ebli.animation.EbliAnimatedInterface; import org.fudaa.ebli.visuallibrary.layout.OverlayLayoutGap; /** @@ -27,15 +28,17 @@ return getIntern().getController(); } - + @Override + public EbliAnimatedInterface getAnimatedInterface() { + return getIntern().getAnimatedInterface(); + } + EbliWidgetControllerActionOnly controllerBordure_ = null; + public EbliWidgetController getBordureController() { return controllerBordure_; } - - - /** * constructeur qui gere un controller uniquement pour les actions. * @@ -58,14 +61,12 @@ insets_ = createInset((int) getTraceLigneModel().getEpaisseur()); setLayout(new OverlayLayoutGap(insets_)); - // -- ajout du child --// addChild(intern_); - // -- mise a jour des evenements (action,menus) du intern --// // intern_.getController().majActionsBordureSpecific(this); - + // --ajout du controller specifique au bordure --// controllerBordure_ = new EbliWidgetControllerActionOnly(this, canMove, canResize); this.setController(controllerBordure_); @@ -86,10 +87,10 @@ // // TraceLigne tl = new TraceLigne(getTraceLigneModel()); // // tl.dessineRectangle(getGraphics(), 0, 0, getClientArea().width, // getClientArea().getHeight()); -// + // // // } - + /** * surcharge des methodes getProperty pour recuperer les proprietes graphiques et les dipatcher a son conteneur */ @@ -97,16 +98,17 @@ // -- la bordure ne gere que tracemodel et couleur contour, le reste est // dispatch\xE9 a son conteneur --// - if (_key.equals(ROTATION)) { - - double radian = intern_.getRotation(); - return Integer.valueOf((int) (radian * 180 / Math.PI)); - - } else if (_key.equals(FONT)) { + // if (_key.equals(ROTATION)) { + // + // double radian = intern_.getRotation(); + // return Integer.valueOf((int) (radian * 180 / Math.PI)); + // + // } + // + if (_key.equals(FONT)) { return intern_.propGraphique.get(_key); - } else if (_key.equals(COLORFOND)) { - return intern_.propGraphique.get(_key); - } else return propGraphique.get(_key); + } else if (_key.equals(COLORFOND)) { return intern_.propGraphique.get(_key); } + return super.getProperty(_key); } @Override Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -15,6 +15,7 @@ import org.fudaa.ctulu.CtuluCommandContainer; import org.fudaa.ctulu.CtuluResource; +import org.fudaa.ebli.animation.EbliAnimatedInterface; import org.fudaa.ebli.commun.EbliActionSimple; import org.fudaa.ebli.commun.EbliComponentFactory; import org.fudaa.ebli.controle.BConfigurableComposite; @@ -24,6 +25,7 @@ import org.fudaa.ebli.visuallibrary.actions.CommandSupprimer; import org.fudaa.ebli.visuallibrary.actions.CommandeDuplicate; import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionBloqueOuDebloqueWidget; +import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionConfigure; import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionSimple; import org.fudaa.ebli.visuallibrary.actions.WidgetConfigure; import org.netbeans.api.visual.action.ActionFactory; @@ -146,11 +148,10 @@ }); } - - + public AbstractButton boutonBloque = null; public boolean isBlocked = false; - + public void constructMenuBloquer(JPopupMenu _popup, final CtuluCommandContainer cmd_) { // EbliWidget widgetListenMove = null; @@ -160,40 +161,37 @@ // widgetListenMove = (EbliWidget) widget_.getParentWidget(); // } else // widgetListenMove = widget_; - + // FuLog.warning("widgetListenMove instanceof " + widgetListenMove); EbliWidgetActionSimple actionBloque = new EbliWidgetActionBloqueOuDebloqueWidget.Bloque(widget_); - + boutonBloque = actionBloque.buildMenuItem(EbliComponentFactory.INSTANCE); - - _popup.add(boutonBloque); + + _popup.add(boutonBloque); } - + public void excecuteBlockOrDeblock() { if (boutonBloque == null) { EbliWidgetActionSimple actionBloque = new EbliWidgetActionBloqueOuDebloqueWidget.Bloque(widget_); boutonBloque = actionBloque.buildMenuItem(EbliComponentFactory.INSTANCE); } - - boutonBloque.doClick(); + + boutonBloque.doClick(); } - + /** - * Methode a appeler apres coup pour mettre a jour les actions, menus et autre - * dans le cas d une bordure englobante de la widget. + * Methode a appeler apres coup pour mettre a jour les actions, menus et autre dans le cas d une bordure englobante de + * la widget. * * @param bordure */ public void majActionsBordureSpecific(EbliWidgetBordureSingle bordure) { - + // -- mise a jour action block/deblock --// EbliWidgetActionSimple actionBloque = new EbliWidgetActionBloqueOuDebloqueWidget.Bloque(bordure); - if (boutonBloque != null) - boutonBloque.setAction(actionBloque); - + if (boutonBloque != null) boutonBloque.setAction(actionBloque); + } - - protected void constructMenuSupprimer(JPopupMenu _popup, final CtuluCommandContainer cmd_) { JMenuItem menuItem = _popup.add(EbliResource.EBLI.getString("Supprimer la frame")); @@ -250,12 +248,9 @@ constructMenuDupliquer(_popup, cmd_); } - constructMenuBloquer(_popup, cmd_); - + constructMenuSupprimer(_popup, cmd_); - - } @@ -272,26 +267,12 @@ menuItem4.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - EbliWidget found = null;// widget_; if (widget_.getParentWidget() != null && widget_.getParentWidget() instanceof EbliWidgetBordureSingle) found = (EbliWidget) widget_ .getParentWidget(); else found = widget_; - - BConfigurePalette palette = new BConfigurePalette(false); - - BConfigurableComposite cmp = WidgetConfigure.configurePalette(found); - - palette.setTargetConf(cmp); - JDialog d = new JDialog(); - d.setModal(true); - d.setTitle(EbliResource.EBLI.getString("Configuration graphique")); - d.setContentPane(palette); - - d.pack(); - d.setVisible(true); - + EbliWidgetActionConfigure.configure(found); } }); @@ -408,7 +389,7 @@ canResize_ = false; } - + public WidgetAction getActionMove() { return actionMove_; } @@ -417,10 +398,8 @@ * fonction inverse de la precedente. */ public void replaceActionResizeAndMove() { - if(actionMove_!=null) - widget_.getActions().addAction(actionMove_); - if(actionResize_!=null) - widget_.getActions().addAction(actionResize_); + if (actionMove_ != null) widget_.getActions().addAction(actionMove_); + if (actionResize_ != null) widget_.getActions().addAction(actionResize_); canMove_ = true; canResize_ = true; Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionConfigure.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionConfigure.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionConfigure.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -6,9 +6,11 @@ import javax.swing.JDialog; +import org.fudaa.ctulu.gui.CtuluLibSwing; import org.fudaa.ebli.commun.EbliLib; import org.fudaa.ebli.controle.BConfigurableComposite; import org.fudaa.ebli.controle.BConfigurePalette; +import org.fudaa.ebli.controle.BSelecteurTargetInterface; import org.fudaa.ebli.visuallibrary.EbliScene; import org.fudaa.ebli.visuallibrary.EbliWidget; import org.netbeans.api.visual.widget.Widget; @@ -33,8 +35,12 @@ */ public void actionPerformed(ActionEvent e) { EbliWidget found = findWidget(); + configure(found); + } + + public static void configure(EbliWidget found) { if (found != null) { - BConfigurePalette palette = new BConfigurePalette(false); + BConfigurePalette palette = new BConfigurePalette(true); // -- creation du composite avec le configure qui genere les interfaces // necessaires --// @@ -42,14 +48,14 @@ // WidgetConfigure(found), "test"); BConfigurableComposite cmp = WidgetConfigure.configurePalette(found); + palette.setTargetConf(cmp); + palette.setTitleVisibleTarget(found, true); - palette.setTargetConf(cmp); - JDialog d = new JDialog(); + JDialog d = CtuluLibSwing.createDialogOnActiveWindow(EbliLib.getS("Configuration graphique")); d.setModal(true); - d.setTitle("Configuration graphique"); d.setContentPane(palette); - d.pack(); + d.setLocationRelativeTo(d.getParent()); d.setVisible(true); } } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/WidgetConfigure.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/WidgetConfigure.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/WidgetConfigure.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -33,6 +33,7 @@ * classe qui permet de creer les selecteurs necessaires pour la configuration. * * @author Adrien Hadoux + * TODO a revoir: ce sont les widgets qui doivent la responsabilite de savoir ce qui peut etre configurer ou non */ public class WidgetConfigure implements BConfigurableInterface { @@ -200,7 +201,7 @@ } else { // -- cas des legendes: juste font et color contour pour resizer le tout --// rotations_ = false; - colorFonds_ = false; + colorFonds_ = true; lineModel_ = false; colorsContours_ = false; Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/animation/EbliWidgetAnimAdapter.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/animation/EbliWidgetAnimAdapter.java (rev 0) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/animation/EbliWidgetAnimAdapter.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -0,0 +1,79 @@ +/** + * Licence GPL + * Copyright Genesis + */ +package org.fudaa.ebli.visuallibrary.animation; + +import java.awt.Component; +import java.awt.Dimension; +import java.awt.image.BufferedImage; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.fudaa.ebli.animation.EbliAnimatedInterface; +import org.fudaa.ebli.animation.EbliAnimationAction; +import org.fudaa.ebli.animation.EbliAnimationAdapterInterface; +import org.fudaa.ebli.animation.EbliAnimationComposite; +import org.fudaa.ebli.animation.EbliAnimationSourceAbstract; +import org.fudaa.ebli.animation.EbliAnimationSourceInterface; +import org.fudaa.ebli.visuallibrary.EbliScene; +import org.fudaa.ebli.visuallibrary.EbliWidget; +import org.netbeans.api.visual.widget.Widget; + +/** + * @author deniger + */ +public class EbliWidgetAnimAdapter extends EbliAnimationSourceAbstract { + + EbliScene scene_; + + public EbliWidgetAnimAdapter(EbliScene _scene) { + super(); + scene_ = _scene; + } + + @SuppressWarnings("serial") + public EbliAnimationAction createAction() { + EbliAnimationAction act = new EbliAnimationAction(this) { + @Override + public void updateBeforeShow() { + super.setAnimAdapterInterface(findAnimAdapter()); + } + }; + act.setEnabled(true); + return act; + } + + public EbliAnimationAdapterInterface findAnimAdapter() { + List<Widget> children = scene_.getLayerVisu().getChildren(); + List<EbliAnimationSourceInterface> anims = new ArrayList<EbliAnimationSourceInterface>(); + for (Widget widget : children) { + EbliWidget ew = (EbliWidget) widget; + EbliAnimatedInterface animatedInterface = ew.getAnimatedInterface(); + if (animatedInterface != null) { + anims.add(animatedInterface.getAnimationSrc()); + } + } + return (new EbliAnimationComposite(anims.toArray(new EbliAnimationSourceInterface[anims.size()]))); + } + + public Component getComponent() { + return scene_.getView(); + } + + public Dimension getDefaultImageDimension() { + return scene_.getDefaultImageDimension(); + } + + public BufferedImage produceImage(int _w, int _h, Map _params) { + return scene_.produceImage(_w, _h, _params); + } + + public BufferedImage produceImage(Map _params) { + return scene_.produceImage(_params); + } + + public void setVideoMode(boolean _b) {} + +} Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/CalqueLegendeWidgetAdapter.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/CalqueLegendeWidgetAdapter.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/CalqueLegendeWidgetAdapter.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -190,8 +190,8 @@ _widgetLegende.setController(new EbliWidgetControllerMenuOnly(_widgetLegende, false)); // -- prendre en compte le resize automatique --// + _widgetLegende.getEbliScene().refresh(); _widgetLegende.setFormeFont(new Font("Helvetica", Font.PLAIN, 10)); - _widgetLegende.repaint(); return _widgetLegende; } else { Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCalqueLegende.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCalqueLegende.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCalqueLegende.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -143,9 +143,11 @@ lbWidget.setFont(boldFont_); Rectangle boundsTitre = lbWidget.getBounds(); + if(boundsTitre!=null){ boundsTitre.width = fmtBold.stringWidth(lbWidget.getLabel()) + 5; maxTitle = Math.max(maxTitle, boundsTitre.width); boundsTitre.height = (int) (fmtBold.getHeight() + 2); + } // lbWidget.setPreferredBounds(boundsTitre); } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -17,6 +17,7 @@ import org.fudaa.ctulu.CtuluCommandContainer; import org.fudaa.ctulu.CtuluResource; +import org.fudaa.ebli.animation.EbliAnimatedInterface; import org.fudaa.ebli.calque.BArbreCalque; import org.fudaa.ebli.calque.BCalquePaletteInfo; import org.fudaa.ebli.calque.ZEbliCalquesPanel; @@ -81,7 +82,7 @@ } - + public void ajoutLegende() { // -- creation de la l\xE9gende --// if (widget_.getEbliScene() != null) { Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -13,6 +13,7 @@ import javax.swing.BorderFactory; import org.fudaa.ctulu.image.CtuluLibImage; +import org.fudaa.ebli.animation.EbliAnimatedInterface; import org.fudaa.ebli.calque.BCalque; import org.fudaa.ebli.calque.ZEbliCalquesPanel; import org.fudaa.ebli.geometrie.GrBoite; @@ -47,8 +48,6 @@ // GrBoite zoom_; public EbliWidgetVueCalque(EbliScene _scene, ZEbliCalquesPanel _vue) { this(_scene, _vue, null); - - } @@ -68,9 +67,6 @@ setPreferredSize(new Dimension(500, 400)); initSize(new Rectangle(0, 0, 500, 400)); - - - } public BuPanel createEditorComponent( @@ -110,6 +106,14 @@ } /** + * @return une interface non null si la widget peut etre animee + */ + public EbliAnimatedInterface getAnimatedInterface() { + if (calquePanel_ instanceof EbliAnimatedInterface) return (EbliAnimatedInterface) calquePanel_; + return null; + } + + /** * Creer une frame qui contient toutes les fonctions pour modifier le calque. Ancienne methode edit(). * * @param _widget Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeTableModel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeTableModel.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeTableModel.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -1,16 +1,20 @@ package org.fudaa.ebli.visuallibrary.tree; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import javax.swing.Icon; +import javax.swing.tree.TreePath; import org.fudaa.ctulu.CtuluLibString; import org.fudaa.ebli.commun.EbliLib; import org.fudaa.ebli.visuallibrary.DefaultObjectSceneListener; import org.fudaa.ebli.visuallibrary.EbliNode; import org.fudaa.ebli.visuallibrary.EbliScene; +import org.fudaa.ebli.visuallibrary.EbliWidget; import org.jdesktop.swingx.treetable.DefaultTreeTableModel; import org.jdesktop.swingx.treetable.MutableTreeTableNode; import org.jdesktop.swingx.treetable.TreeTableNode; @@ -51,55 +55,32 @@ nodeAdded((EbliNode) _addedObject); } - // @Override - // public void selectionChanged(ObjectSceneEvent _event, Set<Object> - // _previousSelection, Set<Object> _newSelection) { - // - // // -- mettre a jour l arbre --// - // EbliWidgetJXTreeTableModel.this.modelSupport.fireTreeStructureChanged( - // null); - // - // } - // - // - // @Override - // public void focusChanged(ObjectSceneEvent _event, Object - // _previousFocusedObject, Object _newFocusedObject) { - // // -- mettre a jour l arbre --// - // EbliWidgetJXTreeTableModel.this.modelSupport.fireTreeStructureChanged( - // null); - // - // } - // - // @Override - // public void hoverChanged(ObjectSceneEvent _event, Object - // _previousHoveredObject, Object _newHoveredObject) { - // // -- mettre a jour l arbre --// - // EbliWidgetJXTreeTableModel.this.modelSupport.fireTreeStructureChanged( - // null); - // - // } - // - // @Override - // public void objectStateChanged(ObjectSceneEvent _event, Object - // _changedObject, ObjectState _previousState, - // ObjectState _newState) { - // // -- mettre a jour l arbre --// - // EbliWidgetJXTreeTableModel.this.modelSupport.fireTreeStructureChanged( - // null); - // - // } - @Override public void objectRemoved(ObjectSceneEvent _event, Object _removedObject) { nodeRemoved((EbliNode) _removedObject); } }; - scene_.addObjectSceneListener(sceneListener_, ObjectSceneEventType.OBJECT_ADDED,ObjectSceneEventType.OBJECT_REMOVED); + scene_.addObjectSceneListener(sceneListener_, ObjectSceneEventType.OBJECT_ADDED, + ObjectSceneEventType.OBJECT_REMOVED); + scene_.addPropertyChangeListener(new PropertyChangeListener() { + + public void propertyChange(PropertyChangeEvent _evt) { + if ("title".equals(_evt.getPropertyName()) || "visible".equals(_evt.getPropertyName())) { + EbliWidget widget = (EbliWidget) _evt.getNewValue(); + EbliNode n = (EbliNode) scene_.findObject(widget); + if (n != null) { + MutableTreeTableNode aNode = findTreeTableNode(n); + if (aNode != null) modelSupport.firePathChanged(new TreePath(getPathToRoot(aNode))); + } + } + + } + }); } - - public void removeListener(){ - scene_.removeObjectSceneListener(sceneListener_, ObjectSceneEventType.OBJECT_ADDED,ObjectSceneEventType.OBJECT_REMOVED); + + public void removeListener() { + scene_.removeObjectSceneListener(sceneListener_, ObjectSceneEventType.OBJECT_ADDED, + ObjectSceneEventType.OBJECT_REMOVED); } public EbliScene getScene() { @@ -180,9 +161,6 @@ } - - - public String getColumnName(int arg0) { if (arg0 < title.length) return title[arg0]; return CtuluLibString.EMPTY_STRING; Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/TrCommonImplementation.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/TrCommonImplementation.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/TrCommonImplementation.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -457,7 +457,7 @@ protected void buildImportMenu() {} protected boolean buildFudaaReportTool() { - return true; + return false; } protected boolean useScrollInBuDesktop() { Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -3,9 +3,11 @@ import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.Point; +import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; +import java.util.Map; import java.util.Set; import javax.swing.JButton; @@ -52,7 +54,7 @@ * @author Adrien Hadoux */ public class TrPostLayoutFille extends BuInternalFrame implements CtuluFilleWithComponent, CtuluUndoRedoInterface, - BuUndoRedoInterface, BuCutCopyPasteInterface, EbliWidgetEditModeListener { + BuUndoRedoInterface, BuCutCopyPasteInterface, EbliWidgetEditModeListener, CtuluImageProducer { /** * @@ -116,8 +118,8 @@ // -- enregistrement de this comem listener de la scene pour le type d objet // selection changed--// -// controller_.getSceneCourante().addObjectSceneListener(this, ObjectSceneEventType.OBJECT_SELECTION_CHANGED, -// ObjectSceneEventType.OBJECT_STATE_CHANGED); + // controller_.getSceneCourante().addObjectSceneListener(this, ObjectSceneEventType.OBJECT_SELECTION_CHANGED, + // ObjectSceneEventType.OBJECT_STATE_CHANGED); controller_.getSceneCourante().getController().addEditListener(this); // -- ajout de la toolbar et du menu en haut --// @@ -294,8 +296,8 @@ for (Iterator<EbliNode> it = ((Set<EbliNode>) getScene().getSelectedObjects()).iterator(); it.hasNext();) { EbliNode node = it.next(); if (!(node.getCreator() instanceof EbliWidgetCreatorLegende) - && !(node.getCreator() instanceof org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorLegende)) - projet_.nodesCopyied.add(node); + && !(node.getCreator() instanceof org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorLegende)) projet_.nodesCopyied + .add(node); } // -- reinit de la commande cut si on voulait faire un ctrl+x projet_.nodesCutted = null; @@ -317,8 +319,8 @@ for (Iterator<EbliNode> it = ((Set<EbliNode>) getScene().getSelectedObjects()).iterator(); it.hasNext();) { EbliNode node = it.next(); if (!(node.getCreator() instanceof EbliWidgetCreatorLegende) - && !(node.getCreator() instanceof org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorLegende)) - projet_.nodesCutted.add(node); + && !(node.getCreator() instanceof org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorLegende)) projet_.nodesCutted + .add(node); } // -- suppression des nodes depuis cetet kliste pour eviter les concourant @@ -335,8 +337,8 @@ projet_.nodesCopyied = null; // --creation de la commande undo/redo --// - if (projet_.nodesCutted != null && projet_.nodesCutted.size() != 0) - getScene().getCmdMng().addCmd(new CommandUndoRedoCut(projet_.nodesCutted)); + if (projet_.nodesCutted != null && projet_.nodesCutted.size() != 0) getScene().getCmdMng().addCmd( + new CommandUndoRedoCut(projet_.nodesCutted)); } @@ -374,8 +376,7 @@ } // --creation de la commande undo/redo --// - if (newNodes.size() != 0) - getScene().getCmdMng().addCmd(new CommandUndoRedoPaste(newNodes)); + if (newNodes.size() != 0) getScene().getCmdMng().addCmd(new CommandUndoRedoPaste(newNodes)); // reinitialisation de la liste projet_.nodesCopyied = null; @@ -391,8 +392,8 @@ getScene().addNode(node); } // --creation de la commande undo/redo --// - if (projet_.nodesCutted != null && projet_.nodesCutted.size() != 0) - getScene().getCmdMng().addCmd(new CommandUndoRedoPaste(projet_.nodesCutted)); + if (projet_.nodesCutted != null && projet_.nodesCutted.size() != 0) getScene().getCmdMng().addCmd( + new CommandUndoRedoPaste(projet_.nodesCutted)); // reinit de la liste projet_.nodesCutted = null; @@ -469,6 +470,18 @@ } + public Dimension getDefaultImageDimension() { + return getScene().getDefaultImageDimension(); + } + + public BufferedImage produceImage(int _w, int _h, Map _params) { + return getScene().produceImage(_w, _h, _params); + } + + public BufferedImage produceImage(Map _params) { + return getScene().produceImage(_params); + } + public void editStop(Widget _w) { changeTreeScene(); changeToolbarScene(); Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -49,6 +49,7 @@ import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionSimple; import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActiontextEditor; import org.fudaa.ebli.visuallibrary.actions.EbliWidgetGroupAction; +import org.fudaa.ebli.visuallibrary.animation.EbliWidgetAnimAdapter; import org.fudaa.ebli.visuallibrary.calque.CalqueLegendeWidgetAdapter; import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorLegende; import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque; @@ -537,8 +538,8 @@ init.add(null); // -- Action sur le format --// - init.add(new EbliWidgetActionColorForeground(getSceneCourante())); - init.add(new EbliWidgetActionColorBackground(getSceneCourante())); +// init.add(new EbliWidgetActionColorForeground(getSceneCourante())); +// init.add(new EbliWidgetActionColorBackground(getSceneCourante())); // -- action de configuration des composants graphiques--// init.add(new EbliWidgetActionConfigure(getSceneCourante())); init.add(null); @@ -549,6 +550,8 @@ // suppression, on choisit la source a prendre en compte --// init.add(new TrPostActionChooseAndCreateCalque(projet_, this)); + init.add(null); + init.add(new EbliWidgetAnimAdapter(getSceneCourante()).createAction()); // -- action qui permet d ajouter un point du calque dans tous les graphes // selectionnes --// // init.add(new TrPostActionAddPointFromWidgetCalque(getSceneCourante(), Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostMinMaxTableModel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostMinMaxTableModel.java 2008-09-16 17:12:47 UTC (rev 3932) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostMinMaxTableModel.java 2008-09-16 22:10:48 UTC (rev 3933) @@ -280,6 +280,7 @@ } } final int nb = list.size(); + if(nb==0) return; final ProgressionUpdater up = new ProgressionUpdater(_impl.createProgressionForMainPanel()); up.setValue(nb, 10); for (int i = 0; i < nb; i++) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <had...@us...> - 2008-09-16 17:12:42
|
Revision: 3932 http://fudaa.svn.sourceforge.net/fudaa/?rev=3932&view=rev Author: hadouxad Date: 2008-09-16 17:12:47 +0000 (Tue, 16 Sep 2008) Log Message: ----------- Fusion de calques - utilise le groupage. - on peut defusionner les calques - action 'edition' sur les popup des calques pour editer celui qu on veut et mettre en premier plan - action 'edition' pr?\195?\169sente pour tous les calques. - undo/redo g?\195?\169r?\195?\169 - propertychangelistener fonctionne pas pour les maj des setMachins - couleur de fond pour les bordures ok - modifs de la fusion des courbes temporelles - duplication des courbes en parcourant les variables - ajout des group si manquants dans le graphe initial - modifs de la fusion des profils spatiaux - meme systeme repris mais cela merdouille Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerForGroup.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetWithBordure.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetUngroupAction.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetFusionCalques.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileTreeModel.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionFusionCalques.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionFusionGraphes.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostScene.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostWizardCourbeTemporelle.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostWizardProfilSpatial.java Removed Paths: ------------- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerFusionCalque.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorFusionCalques.java Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -51,6 +51,9 @@ private EbliScene scene_; private boolean useBorder_ = true; + + + /** * @param scene @@ -274,6 +277,9 @@ public void removePropertyChangeListener(String _key, PropertyChangeListener _l) {} + public void removePropertyChangeListenerFormWidget(EbliWidget _widget) { + } + public void setColorContour(Color newColor) { propGraphique.put(COLORCONTOUR, newColor); } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -58,6 +58,7 @@ insets_ = createInset((int) getTraceLigneModel().getEpaisseur()); setLayout(new OverlayLayoutGap(insets_)); + // -- ajout du child --// addChild(intern_); @@ -75,6 +76,20 @@ return new Insets(epaisseur, epaisseur, epaisseur, epaisseur); } + // protected void paintWidget() { + // // getGraphics().setColor(getColorFond()); + // // getGraphics().fillRect(insets_.left, insets_.top, + // // getClientArea().width - insets_.left - insets_.right, + // // getClientArea().height - insets_.bottom - insets_.top); + // // getGraphics().setColor(getColorContour()); + // // + // // TraceLigne tl = new TraceLigne(getTraceLigneModel()); + // // tl.dessineRectangle(getGraphics(), 0, 0, getClientArea().width, + // getClientArea().getHeight()); +// + // + // } + /** * surcharge des methodes getProperty pour recuperer les proprietes graphiques et les dipatcher a son conteneur */ Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -408,6 +408,10 @@ canResize_ = false; } + + public WidgetAction getActionMove() { + return actionMove_; + } /** * fonction inverse de la precedente. Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerForGroup.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerForGroup.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerForGroup.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -13,6 +13,8 @@ */ public class EbliWidgetControllerForGroup extends EbliWidgetController { + public boolean hasAlreadyFusion = false; + public EbliWidgetControllerForGroup(EbliWidget _widget) { super(_widget,true,true,false); } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetWithBordure.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetWithBordure.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetWithBordure.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -41,20 +41,28 @@ Rectangle rec = getClientArea(); - // -- couleur de fond --// - // g.setColor(getColorFond()); - // g.fillRect(0, 0, rec.width, rec.height); + g.translate(rec.x, rec.y); - // la ligne - + + + TraceLigne l = new TraceLigne(getTraceLigneModel()); + getGraphics().setColor(getColorFond()); + getGraphics().fillRect(0, 0, (int) (rec.width - l.getEpaisseur()), (int) (rec.height - l.getEpaisseur())); + + l.setCouleur(getColorContour()); l.dessineRectangle(g, (int) (l.getEpaisseur() / 2), (int) (l.getEpaisseur() / 2), (int) (rec.width - l .getEpaisseur()), (int) (rec.height - l.getEpaisseur())/* , rec.width */); + + + g.translate(-rec.x, -rec.y); + + // setBackground(getColorFond()); } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetUngroupAction.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetUngroupAction.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetUngroupAction.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -7,10 +7,7 @@ import java.awt.Point; import java.awt.event.ActionEvent; import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; import java.util.List; -import java.util.Set; import org.fudaa.ebli.commun.EbliLib; import org.fudaa.ebli.ressource.EbliResource; @@ -38,7 +35,7 @@ } - protected static void degroupObjects(EbliScene _scene, EbliNode _n) { + public static void degroupObjects(EbliScene _scene, EbliNode _n) { if (_n == null) { return; } // Set cs = new HashSet(); // for (final Iterator iterator = selectedObjects.iterator(); iterator.hasNext();) { @@ -50,6 +47,10 @@ Point toScene = w.convertLocalToScene(p); EbliNode n = (EbliNode) _scene.findObject(widget); widget.removeFromParent(); + + // -- utilis\xE9 pour enlever les propertychange listener + w.removePropertyChangeListenerFormWidget((EbliWidget) widget); + _n.setPreferedLocation(toScene); _n.setPreferedSize(widget.getPreferredSize()); // widget.setPreferredLocation(toScene); Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -28,11 +28,11 @@ import org.fudaa.ebli.ressource.EbliResource; import org.fudaa.ebli.visuallibrary.EbliNode; import org.fudaa.ebli.visuallibrary.EbliWidget; +import org.fudaa.ebli.visuallibrary.EbliWidgetBordureSingle; import org.fudaa.ebli.visuallibrary.EbliWidgetControllerMenuOnly; import org.fudaa.ebli.visuallibrary.EbliWidgetWithBordure; import org.fudaa.ebli.visuallibrary.actions.CommandMasquer; import org.fudaa.ebli.visuallibrary.actions.EbliActionEditorOneClick; -import org.netbeans.api.visual.action.WidgetAction; import com.memoire.bu.BuMenuBar; import com.memoire.bu.BuPanel; @@ -63,6 +63,7 @@ EbliWidgetVueCalque widgetCalque_; EbliWidgetWithBordure widgetParent_; + EbliActionEditorOneClick<BuPanel> editorAction_; public EbliWidgetControllerCalque(EbliWidgetVueCalque _widget, EbliWidgetWithBordure _parent) { super(_parent); @@ -74,9 +75,10 @@ public void addActionSpecifiques() { - WidgetAction editorAction = new EbliActionEditorOneClick<BuPanel>((EbliWidgetVueCalque) widgetCalque_); + editorAction_ = new EbliActionEditorOneClick<BuPanel>((EbliWidgetVueCalque) widgetCalque_); // -- ajout de l action au widget correspondant --// - widgetCalque_.getActions().addAction(editorAction); + widgetCalque_.getActions().addAction(editorAction_); + } @@ -161,12 +163,43 @@ public void actionPerformed(ActionEvent e) { + + ajoutLegende(); } }); + menuItem = new JMenuItem(EbliResource.EBLI.getString("Editer le calque")); + _popup.add(menuItem, 0); + menuItem.setIcon(CtuluResource.CTULU.getIcon("crystal_editer")); + menuItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + MenuEditer(); + + + } + }); + } + + /** + * Mise au premier plan de la widget et edition. Sert beaucoup pour la fusion + */ + public void MenuEditer() { + // -- premier plan pour la visualiser dans le groupe --// + if (this.widgetCalque_.getParentWidget() != null + && this.widgetCalque_.getParentWidget() instanceof EbliWidgetBordureSingle) + this.widgetCalque_.getParentWidget().bringToFront(); + else + this.widgetCalque_.bringToFront(); + + // -- executer l action d edition --// + editorAction_.openEditor(widgetCalque_); + + } + public ZEbliCalquesPanel getCalque() { return widgetCalque_.calquePanel_; } Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerFusionCalque.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerFusionCalque.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerFusionCalque.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -1,269 +0,0 @@ -package org.fudaa.ebli.visuallibrary.calque; - -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.image.BufferedImage; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.swing.BorderFactory; -import javax.swing.DefaultListModel; -import javax.swing.Icon; -import javax.swing.ImageIcon; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.JMenu; -import javax.swing.JPanel; -import javax.swing.JPopupMenu; -import javax.swing.JScrollPane; -import javax.swing.ListSelectionModel; - -import org.fudaa.ctulu.image.CtuluLibImage; -import org.fudaa.ebli.calque.BArbreCalque; -import org.fudaa.ebli.calque.BCalquePaletteInfo; -import org.fudaa.ebli.calque.ZEbliCalquesPanel; -import org.fudaa.ebli.calque.action.EbliCalqueActionTimeChooser; -import org.fudaa.ebli.commun.EbliActionInterface; -import org.fudaa.ebli.commun.EbliComponentFactory; -import org.fudaa.ebli.commun.EbliLib; -import org.fudaa.ebli.controle.BSelecteurListComboBox; -import org.fudaa.ebli.ressource.EbliResource; -import org.fudaa.ebli.visuallibrary.EbliWidgetControllerMenuOnly; -import org.fudaa.ebli.visuallibrary.EbliWidgetWithBordure; -import org.fudaa.ebli.visuallibrary.graphe.GrapheCellRenderer; - -import com.memoire.bu.BuMenuBar; -import com.memoire.bu.BuToolBar; - -public class EbliWidgetControllerFusionCalque extends EbliWidgetControllerMenuOnly { - - JLabel labelTrace_; - - /** - * widget de la legende - */ - CalqueLegendeWidgetAdapter legendeWidget_; - - BuMenuBar menuCalque_; - - JPanel panelTreeCalque_; - - BuToolBar toolbarCalque_; - - JList selectionCalque_; - - BArbreCalque arbreCalque_; - - EbliWidgetFusionCalques widgetCalque_; - EbliWidgetWithBordure widgetParent_; - - - - public boolean hasAlreadyFusion = false; - - - public EbliWidgetControllerFusionCalque(EbliWidgetFusionCalques _widget, EbliWidgetWithBordure _parent) { - super(_parent); - widgetCalque_ = _widget; - widgetParent_ = _parent; - addActionSpecifiques(); - - } - - public void addActionSpecifiques() { - - // WidgetAction editorAction = new EbliActionEditorOneClick<BuPanel>( - // (EbliWidgetVueCalque) widgetCalque_.widgetCalque1_); - // // -- ajout de l action au widget correspondant --// - // widgetCalque_.getActions().addAction(editorAction); - - } - - - - -public ZEbliCalquesPanel getCalqueCourant() { - return widgetCalque_.getCalqueCourant().calquePanel_; - } - - - /** - * retourne le menuBar associee au calque - * - * @return - */ - public BuMenuBar getMenubarComponent() { - - if (menuCalque_ == null) { - - menuCalque_ = new BuMenuBar(); - - } - menuCalque_.removeAll(); - - JMenu[] specificMenus = getCalqueCourant().getSpecificMenus(EbliLib.getS("Vue 2D")); - - for (int i = 0; i < specificMenus.length; i++) { - menuCalque_.add(specificMenus[i]); - } - - - return menuCalque_; - - } - - /** - * remplit le model de la liste par des labels representants le contenu du - * widgt fusion. - * - * @return - */ -public DefaultListModel fillModelListWithCalques() { - Map params = new HashMap(); - CtuluLibImage.setCompatibleImageAsked(params); - DefaultListModel model = new DefaultListModel(); - for (int i = 0; i < widgetCalque_.listeWidgetCalque_.size(); i++) { - - JLabel label = new JLabel(); - label.setText("" + widgetCalque_.getWidgetCalque(i).calquePanel_.getCqInfos().getTitle()); - BufferedImage image = widgetCalque_.getWidgetCalque(i).calquePanel_.produceImage(70, 30, params); - Icon icone = new ImageIcon(image); - label.setIcon(icone); - model.addElement(label); - - } - - selectionCalque_.addListSelectionListener(widgetCalque_); - // model.addListDataListener(widgetCalque_); - - return model; - } - - /** - * Recupere les objets graphique tree et panel infos associe au calque. - * - * @return - */ - public JComponent getOverviewComponent() { - - // -- jlist qui propose la liste des composants du calque --// - if (selectionCalque_ == null) { - selectionCalque_ = new JList(); - selectionCalque_.setCellRenderer(new GrapheCellRenderer()); - selectionCalque_.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Liste des calques"))); - selectionCalque_.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - selectionCalque_.setSize(250, 100); - selectionCalque_.setPreferredSize(new Dimension(250, 100)); - selectionCalque_.setMaximumSize(new Dimension(250, 100)); - - - } - // -- creation du model de la jlist --// - DefaultListModel model = fillModelListWithCalques(); - selectionCalque_.setModel(model); - // selectionCalque_.setSelectedIndex(widgetCalque_.getIndexCalqueCourant()); - - - - if (panelTreeCalque_ == null) { - panelTreeCalque_ = new JPanel(new BorderLayout()); - - - BCalquePaletteInfo info = new BCalquePaletteInfo(getCalqueCourant().getArbreCalqueModel()); - info.setAvailable(true); - panelTreeCalque_.add(info, BorderLayout.NORTH); - JPanel panelConteneur = new JPanel(new BorderLayout()); - - arbreCalque_ = new BArbreCalque(); - arbreCalque_.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Arbre du calque"))); - panelConteneur.add(arbreCalque_, BorderLayout.CENTER); - panelConteneur.add(new JScrollPane(selectionCalque_), BorderLayout.NORTH); - - panelTreeCalque_.add(new JScrollPane(panelConteneur), BorderLayout.CENTER); - - } - // -- mise a jour du model de l arbre --// - arbreCalque_.setModel(getCalqueCourant().getArbreCalqueModel()); - - - return panelTreeCalque_; - } - - /** - * Obtient la toolbar specifique au calque - * - * @return - */ - public BuToolBar getToolbarComponent() { - - if (toolbarCalque_ == null) { - toolbarCalque_ = new BuToolBar(); - } - toolbarCalque_.removeAll(); - - // ajout des tool specifiques du calque - List actions = getCalqueCourant().getController().getActions(); - for (Iterator iterator = actions.iterator(); iterator.hasNext();) { - EbliActionInterface object = (EbliActionInterface) iterator.next(); - if (object == null) { - toolbarCalque_.addSeparator(); - } else { - toolbarCalque_.add(object.buildToolButton(EbliComponentFactory.INSTANCE)); - } - } - - // -- ajout des comboBox des variables --// - BSelecteurListComboBox combo = new BSelecteurListComboBox(); - // pour mettre \xE0 jour la combo d\xE8s que la s\xE9lection de l'arbre change - getCalqueCourant().getArbreCalqueModel().getTreeSelectionModel().addTreeSelectionListener(combo); - combo.setPalettePanelTarget(getCalqueCourant().getArbreCalqueModel().getSelectedCalque()); - // combo.setPalettePanelTarget(listselector.getTarget()); - combo.setMinimumSize(combo.getPreferredSize()); - combo.setMaximumSize(combo.getPreferredSize()); - - // ajout combobox - toolbarCalque_.add(combo); - - // -- ajout des combo des pas de temps --// - EbliCalqueActionTimeChooser chooserT = new EbliCalqueActionTimeChooser(getCalqueCourant().getArbreCalqueModel() - .getTreeSelectionModel(), true); - // pour activer l'action - chooserT.setSelected(true); - combo = (BSelecteurListComboBox) chooserT.buildContentPane(); - chooserT.updateBeforeShow(); - combo.setMaximumSize(combo.getPreferredSize()); - combo.setMinimumSize(combo.getPreferredSize()); - - // ajout combobox - toolbarCalque_.add(combo); - - - return toolbarCalque_; - } - - /** - * affiche le label des coordonnees - */ - public JComponent geTtracableComponent() { - - - return getCalqueCourant().getLabelSuiviSouris(); - } - - - - @Override - protected void buildPopupMenu(JPopupMenu _menu) { - // constructPopupMenuSpecifique(_menu); - // -- creation du menu commun a tous les widgets - constructPopupMenuBase(_menu); - } - - - - - -} Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorFusionCalques.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorFusionCalques.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorFusionCalques.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -1,73 +0,0 @@ -package org.fudaa.ebli.visuallibrary.calque; - -import java.awt.Dimension; -import java.util.ArrayList; -import java.util.Iterator; - -import org.fudaa.ebli.geometrie.GrBoite; -import org.fudaa.ebli.visuallibrary.EbliNode; -import org.fudaa.ebli.visuallibrary.EbliScene; -import org.fudaa.ebli.visuallibrary.EbliWidget; -import org.fudaa.ebli.visuallibrary.EbliWidgetBordureSingle; -import org.fudaa.ebli.visuallibrary.EbliWidgetCreator; -import org.fudaa.ebli.visuallibrary.EbliWidgetWithBordure; - -public class EbliWidgetCreatorFusionCalques implements EbliWidgetCreator { - - ArrayList<EbliWidgetVueCalque> listeWidgetCalque_; - - GrBoite initZoom_; - - EbliWidgetWithBordure res; - - - - public EbliWidgetCreatorFusionCalques(EbliWidgetVueCalque widgetCalque1_, - ArrayList<EbliWidgetVueCalque> listWidgetToMerge) { - this(widgetCalque1_, listWidgetToMerge, null); - } - - public EbliWidgetCreatorFusionCalques(EbliWidgetVueCalque widgetCalque1_, - ArrayList<EbliWidgetVueCalque> listWidgetToMerge, - GrBoite _initZoom) { - super(); - listeWidgetCalque_ = new ArrayList<EbliWidgetVueCalque>(); - - listeWidgetCalque_.add(widgetCalque1_); - - for (Iterator<EbliWidgetVueCalque> it = listWidgetToMerge.iterator(); it.hasNext();) - listeWidgetCalque_.add(it.next()); - - initZoom_ = _initZoom; - // legendeDuplic_= - } - - - public EbliWidget create(EbliScene _scene) { - EbliWidgetFusionCalques widgetCalque = new EbliWidgetFusionCalques(_scene, listeWidgetCalque_, - initZoom_); - res = new EbliWidgetBordureSingle(widgetCalque); - res.setPreferredSize(new Dimension(400, 400)); - widgetCalque.setController(new EbliWidgetControllerFusionCalque(widgetCalque, res)); - return res; - } - - - - public EbliWidgetWithBordure getBordure() { - return res; - } - - - - public EbliWidget getWidget() { - return res; - } - - public EbliNode duplicate(EbliNode _nodeAdupliquer) { - return null; - } - - - -} Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetFusionCalques.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetFusionCalques.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetFusionCalques.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -1,133 +1,94 @@ package org.fudaa.ebli.visuallibrary.calque; -import java.awt.Dimension; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Iterator; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - -import org.fudaa.ebli.calque.ZEbliCalquesPanel; -import org.fudaa.ebli.geometrie.GrBoite; +import org.fudaa.ebli.calque.BCalque; +import org.fudaa.ebli.geometrie.GrMorphisme; import org.fudaa.ebli.visuallibrary.EbliScene; import org.fudaa.ebli.visuallibrary.EbliWidget; -import org.netbeans.modules.visual.layout.OverlayLayout; +import com.memoire.fu.FuLog; + /** - * Widget qui resulte de la fusion de 2 calques. + * Widget qui resulte de la fusion de calques * * @author Adrien Hadoux * */ -public class EbliWidgetFusionCalques extends EbliWidget implements ListSelectionListener { +public final class EbliWidgetFusionCalques extends EbliWidget implements PropertyChangeListener { - ArrayList<EbliWidgetVueCalque> listeWidgetCalque_; - - /** - * Calque courant qui sera modifi\xE9 a chaque fois que l utilisateur changera de - * calque de premier plan. - */ - EbliWidgetVueCalque calqueCourant_; + public final ArrayList<EbliWidgetVueCalque> listeWidgetCalque_ = new ArrayList<EbliWidgetVueCalque>(); - OverlayLayout layout_; - GrBoite initZoom_; - - - public EbliWidgetFusionCalques(EbliScene _scene, ArrayList<EbliWidgetVueCalque> _liste, GrBoite zoom) { + public EbliWidgetFusionCalques(EbliScene _scene) { super(_scene); + //calquePanel_.getVueCalque().getAbstractCalque().addPropertyChangeListener( + // "versReel", listener); - initZoom_ = zoom; - listeWidgetCalque_=_liste; - // --creation du layout de mise en page --// - layout_ = new OverlayLayout(); - this.setLayout(layout_); - - // -- ajout des widgets --// - for (Iterator<EbliWidgetVueCalque> it = listeWidgetCalque_.iterator(); it.hasNext();) { - EbliWidgetVueCalque calque = it.next(); - this.addChild(calque); - // -- mise a jour du zoom - calque.initZoom_ = initZoom_; - - // init le calque courant - if (calqueCourant_ == null) - calqueCourant_ = calque; - } - setPreferredSize(new Dimension(500, 400)); - } - /** - * Methode utilisee pour mettre au premier plan la widget selectionnee. - * - * @param newCrt - * : nouvelle widget calque a positionner au premier plan - */ - public void changeWidgetCourant(EbliWidgetVueCalque newCrt) { - calqueCourant_ = newCrt; + public void addChildCalque(EbliWidget child) { + + addChild(child); - // -- mise au premier plan de newCrt --// - bringToFront(calqueCourant_); + EbliWidgetVueCalque widgetCalque; + if (child instanceof EbliWidgetVueCalque) + widgetCalque = (EbliWidgetVueCalque) child; + else + widgetCalque = (EbliWidgetVueCalque) child.getChildren().get(0); + listeWidgetCalque_.add(widgetCalque); + // -- ajout du listener des calques sur this --// + widgetCalque.calquePanel_.getVueCalque().getAbstractCalque().addPropertyChangeListener("versEcran", this); + widgetCalque.calquePanel_.getVueCalque().getAbstractCalque().addPropertyChangeListener("versReel", this); } + + boolean noCyclePropertieChange = true; - - public void bringToFront(EbliWidgetVueCalque widget) { + public void propertyChange(PropertyChangeEvent _evt) { - this.removeChild(widget); + if (!noCyclePropertieChange) + return; + noCyclePropertieChange = false; + // listeWidgetCalque_.get(0).calquePanel_.getVueCalque().changeViewBoite( + // _source, _boite, _rapide) + FuLog.warning("je rentre dans propertychange !!!"); + GrMorphisme morph = (GrMorphisme) _evt.getNewValue(); - // -- ajout pour qu elle soit en premier plan --// - this.addChild(widget); - - // -- refrresh de la scene --// + for (Iterator<EbliWidgetVueCalque> it = listeWidgetCalque_.iterator(); it.hasNext();) { + EbliWidgetVueCalque widget = it.next(); + if (_evt.getPropertyName().equals("versEcran")) { + ((BCalque) widget.calquePanel_.getVueCalque().getAbstractCalque()).setVersEcran(morph); + + } else { + ((BCalque) widget.calquePanel_.getVueCalque().getAbstractCalque()).setVersReel(morph); + } + + } + noCyclePropertieChange = true; getEbliScene().refresh(); } - public EbliWidgetVueCalque getCalqueCourant() { - return calqueCourant_; - } - - - public ZEbliCalquesPanel getCalque(int i) { + /** + * Surcharge de la methode de ebli, utilisse pour virer les property change + * listener + */ + public void removePropertyChangeListenerFormWidget(EbliWidget child) { + EbliWidgetVueCalque widgetCalque; + if (child instanceof EbliWidgetVueCalque) + widgetCalque = (EbliWidgetVueCalque) child; + else + widgetCalque = (EbliWidgetVueCalque) child.getChildren().get(0); + widgetCalque.calquePanel_.getVueCalque().getAbstractCalque().removePropertyChangeListener("versEcran", this); + widgetCalque.calquePanel_.getVueCalque().getAbstractCalque().removePropertyChangeListener("versReel", this); + + - return getWidgetCalque(i).calquePanel_; } - public int getNbWidgets() { - return listeWidgetCalque_.size(); - } - - public EbliWidgetVueCalque getWidgetCalque(int i) { - return listeWidgetCalque_.get(i); - } - - - public int getIndexCalqueCourant() { - - for (int i = 0; i < listeWidgetCalque_.size(); i++) - if (listeWidgetCalque_.get(i) == calqueCourant_) - return i; - - return -1; - } - - public void valueChanged(ListSelectionEvent _e) { - - // -- on est dans un cas single selection mode --// - int selected = _e.getFirstIndex(); - - // -- on change de calque courant --// - if (selected < listeWidgetCalque_.size()) - changeWidgetCourant(getWidgetCalque(selected)); - - } - - - - - - } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -47,6 +47,8 @@ // GrBoite zoom_; public EbliWidgetVueCalque(EbliScene _scene, ZEbliCalquesPanel _vue) { this(_scene, _vue, null); + + } @@ -66,10 +68,9 @@ setPreferredSize(new Dimension(500, 400)); initSize(new Rectangle(0, 0, 500, 400)); - // _vue.addCqLegende(new BCalqueLegende()); - - // --ajout du controller specifique au graphe --// - + + + } public BuPanel createEditorComponent( Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileTreeModel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileTreeModel.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/profile/MvProfileTreeModel.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -18,16 +18,18 @@ import javax.swing.tree.TreePath; -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.LineString; - -import com.memoire.bu.BuLib; -import com.memoire.bu.BuResource; - -import org.fudaa.ctulu.*; +import org.fudaa.ctulu.CtuluCommand; +import org.fudaa.ctulu.CtuluCommandContainer; +import org.fudaa.ctulu.CtuluCommandManager; +import org.fudaa.ctulu.CtuluLibArray; +import org.fudaa.ctulu.CtuluLibString; +import org.fudaa.ctulu.CtuluRunnable; +import org.fudaa.ctulu.CtuluTaskDelegate; +import org.fudaa.ctulu.CtuluUI; +import org.fudaa.ctulu.CtuluVariable; +import org.fudaa.ctulu.ProgressionInterface; import org.fudaa.ctulu.gis.GISGeometryFactory; import org.fudaa.ctulu.gui.CtuluLibSwing; - import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.ef.operation.EfLineIntersection; import org.fudaa.dodico.ef.operation.EfLineIntersectionsCorrectionTester; @@ -35,7 +37,6 @@ import org.fudaa.dodico.ef.operation.EfLineIntersectionsResultsI; import org.fudaa.dodico.ef.operation.EfLineIntersectionsResultsMng; import org.fudaa.dodico.h2d.type.H2dVariableType; - import org.fudaa.ebli.courbe.EGAxeVertical; import org.fudaa.ebli.courbe.EGCourbe; import org.fudaa.ebli.courbe.EGCourbeChild; @@ -43,11 +44,15 @@ import org.fudaa.ebli.courbe.EGGrapheTreeModel; import org.fudaa.ebli.courbe.EGGroup; import org.fudaa.ebli.courbe.EGObject; - import org.fudaa.fudaa.commun.courbe.FudaaCourbeTimeListModel; import org.fudaa.fudaa.meshviewer.MvResource; import org.fudaa.fudaa.meshviewer.export.MvExportChooseVarAndTime; +import com.memoire.bu.BuLib; +import com.memoire.bu.BuResource; +import com.vividsolutions.jts.geom.Coordinate; +import com.vividsolutions.jts.geom.LineString; + /** * @author fred deniger * @version $Id: MvProfileTreeModel.java,v 1.12 2007-06-13 14:46:13 deniger Exp @@ -60,7 +65,7 @@ EfLineIntersectionsResultsBuilder builderMesh_; EfLineIntersectionsResultsMng resMesh_; final EfLineIntersectionsCorrectionTester tester_; - final MvProfileTarget target_; + public final MvProfileTarget target_; public MvProfileTreeModel(final MvProfileTarget _target, final EfLineIntersectionsCorrectionTester _tester) { super(); @@ -154,7 +159,15 @@ return GISGeometryFactory.INSTANCE.createLineString(cs); } - protected MvProfileCourbeGroup getGroup(final CtuluVariable _v, final boolean _create) { + /** + * Recherche le bon groupe pour les profils spatiaux. peut creer le groupe si + * booleen est a true. + * + * @param _v + * @param _create + * @return + */ + public MvProfileCourbeGroup getGroup(final CtuluVariable _v, final boolean _create) { for (int i = getNbEGObject() - 1; i >= 0; i--) { final EGGroup g = getGroup(i); if ((g instanceof MvProfileCourbeGroup) && ((MvProfileCourbeGroup) g).getVar() == _v) { return (MvProfileCourbeGroup) g; } Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionFusionCalques.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionFusionCalques.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionFusionCalques.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -1,12 +1,19 @@ package org.fudaa.fudaa.tr.post; import java.awt.BorderLayout; +import java.awt.Dimension; import java.awt.FlowLayout; +import java.awt.Insets; +import java.awt.Point; +import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; @@ -22,30 +29,34 @@ import javax.swing.JPanel; import javax.swing.ListSelectionModel; +import org.fudaa.ctulu.CtuluCommand; import org.fudaa.ctulu.CtuluResource; import org.fudaa.ctulu.ProgressionBuAdapter; import org.fudaa.ctulu.ProgressionInterface; import org.fudaa.ctulu.gui.CtuluTaskOperationGUI; import org.fudaa.ctulu.image.CtuluLibImage; import org.fudaa.ebli.calque.ZEbliCalquesPanel; +import org.fudaa.ebli.commun.EbliLib; import org.fudaa.ebli.ressource.EbliResource; import org.fudaa.ebli.visuallibrary.EbliNode; import org.fudaa.ebli.visuallibrary.EbliNodeDefault; -import org.fudaa.ebli.visuallibrary.EbliWidgetBordureSingle; +import org.fudaa.ebli.visuallibrary.EbliWidget; +import org.fudaa.ebli.visuallibrary.EbliWidgetControllerForGroup; +import org.fudaa.ebli.visuallibrary.EbliWidgetGroupCreator; import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionSimple; +import org.fudaa.ebli.visuallibrary.actions.EbliWidgetUngroupAction; import org.fudaa.ebli.visuallibrary.calque.EbliWidgetControllerCalque; -import org.fudaa.ebli.visuallibrary.calque.EbliWidgetControllerFusionCalque; -import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorFusionCalques; import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque; import org.fudaa.ebli.visuallibrary.calque.EbliWidgetFusionCalques; import org.fudaa.ebli.visuallibrary.calque.EbliWidgetVueCalque; import org.fudaa.ebli.visuallibrary.graphe.GrapheCellRenderer; +import org.fudaa.ebli.visuallibrary.layout.OverlayLayoutGap; import org.fudaa.fudaa.tr.common.TrResource; +import org.netbeans.api.visual.widget.Widget; import com.memoire.bu.BuDialog; -import com.memoire.bu.BuDialogConfirmation; +import com.memoire.bu.BuDialogMessage; import com.memoire.bu.BuScrollPane; -import com.memoire.fu.FuLog; /** * Action qui realise la fusion des calques @@ -100,28 +111,8 @@ - /** - * Constructeur pour le cas d une widget fusion - */ - public TrPostActionFusionCalques(EbliWidgetFusionCalques widgetFusion, EbliNode nodeGraphe, TrPostProjet projet) { - super(widgetFusion.getEbliScene(), TrResource.getS("Fusion avec un autre calque"), CtuluResource.CTULU - .getIcon("cible"), - "ADDPOINTWIDGET"); + - for (int i = 1; i < widgetFusion.getNbWidgets(); i++) - listeTotaleWidgetToMerge_.add(widgetFusion.getWidgetCalque(i)); - - widgetCalque_ = widgetFusion.getWidgetCalque(0); - nodeCalque_ = nodeGraphe; - projet_ = projet; - - // -- ajout de la combo dans la toolbar de la widget --// - if (!((EbliWidgetControllerFusionCalque) widgetFusion.getController()).hasAlreadyFusion) { - widgetFusion.getController().getPopup().add(this); - ((EbliWidgetControllerFusionCalque) widgetFusion.getController()).hasAlreadyFusion = true; - } - } - /** * remplissage de la combo avec les graphes disponibles et compatibles * @@ -155,21 +146,7 @@ } - } else if (currentNode != nodeCalque_ && currentNode.getCreator() instanceof EbliWidgetCreatorFusionCalques) { - - // -- on ajoute le node potentiel qui renferme une widget fusion --// - EbliWidgetCreatorFusionCalques new_name = (EbliWidgetCreatorFusionCalques) currentNode.getCreator(); - - if (isCompatibleWithCalque(new_name)) { - - JLabel label = new JLabel(); - label.setText(TrResource.TR.getString("Fusionner avec la Fusion ") + currentNode.getTitle()); - listeObjetsCalques.add(label); - listeCalquesPossibles.add(currentNode); - } - - - } + } } @@ -205,9 +182,7 @@ return true; } - public boolean isCompatibleWithCalque(EbliWidgetCreatorFusionCalques widgetFusion) { - return true; - } + @@ -249,116 +224,142 @@ return; } + final ArrayList<EbliNode> listeToMerge = new ArrayList<EbliNode>(); + //-- parcours de la liste des indices selectionnes --// for(int i=0;i<selected.length;i++){ EbliNode nodeToMerge = listeCalquesPossibles.get(selected[i]); - // --recuperation de son graphe --// + // --Ajout du noeud --// + listeToMerge.add(nodeToMerge); - //cas bordure - if (nodeToMerge.getWidget() instanceof EbliWidgetBordureSingle){ - if(((EbliWidgetBordureSingle) nodeToMerge.getWidget()).getIntern() instanceof EbliWidgetVueCalque){ - EbliWidgetVueCalque calqueWidget = (EbliWidgetVueCalque) ((EbliWidgetBordureSingle) nodeToMerge.getWidget()).getIntern(); - // -- ajout de la widget cible a la liste a merger --// - listeTotaleWidgetToMerge_.add(calqueWidget); - - // -- suppression du noeud de la scene--// - if (nodeToMerge != null) - scene_.removeNodeWithEdges(nodeToMerge); - } - else - //-- cas le noeud selectionne contient des fusionWidget - if(((EbliWidgetBordureSingle) nodeToMerge.getWidget()).getIntern() instanceof EbliWidgetFusionCalques){ - - EbliWidgetFusionCalques calqueWidget = (EbliWidgetFusionCalques) ((EbliWidgetBordureSingle) nodeToMerge.getWidget()).getIntern(); - // -- ajout de toutes les widgets de la FusionWidget --// - for(int k=0;k< calqueWidget.getNbWidgets();k++) - listeTotaleWidgetToMerge_.add(calqueWidget.getWidgetCalque(k)); - - // -- suppression du noeud de la scene--// - if (nodeToMerge != null) - scene_.removeNodeWithEdges(nodeToMerge); - } - - - - } - else{ - if( nodeToMerge.getWidget() instanceof EbliWidgetVueCalque){ - EbliWidgetVueCalque calqueWidget = (EbliWidgetVueCalque) nodeToMerge.getWidget(); - // -- ajout de la widget cible a la liste a merger --// - listeTotaleWidgetToMerge_.add(calqueWidget); - - // -- suppression du noeud de la scene--// - if (nodeToMerge != null) - scene_.removeNodeWithEdges(nodeToMerge); - } - else - //-- cas le noeud selectionne contient des fusionWidget - if( nodeToMerge.getWidget()instanceof EbliWidgetFusionCalques){ - - EbliWidgetFusionCalques calqueWidget = (EbliWidgetFusionCalques) nodeToMerge.getWidget(); - // -- ajout de toutes les widgets de la FusionWidget --// - for(int k=0;k< calqueWidget.getNbWidgets();k++) - listeTotaleWidgetToMerge_.add(calqueWidget.getWidgetCalque(k)); - - // -- suppression du noeud de la scene--// - if (nodeToMerge != null) { - scene_.removeNodeWithEdges(nodeToMerge); - scene_.refresh(); - } - } - - } - } - + } + // -- ajout du node initial --// + listeToMerge.add(nodeCalque_); - - FuLog.warning("NB LISTE DES WIDGETS: " + listeTotaleWidgetToMerge_.size()); - // --ajout de la courbe au widget de base --// new CtuluTaskOperationGUI(projet_.impl_, TrResource.getS("Fusion avec un autre calque")) { public void act() { final ProgressionInterface prog = new ProgressionBuAdapter(this); + final EbliNode fusion = groupWidgetsFusion(listeToMerge); + + + // -- undo/redo --// + getScene().getCmdMng().addCmd(new CtuluCommand() { - - // -- creation de la nouvelle widget contenant les 2 calques --// - EbliNode nodeFusion = new EbliNodeDefault(); - nodeFusion.setTitle(TrResource.getS("Fusion de calques")); - - nodeFusion.setCreator(new EbliWidgetCreatorFusionCalques(widgetCalque_, listeTotaleWidgetToMerge_)); - - scene_.addNode(nodeFusion); + public void undo() { + EbliWidgetUngroupAction.degroupObjects(getScene(), fusion); + } + + public void redo() { + groupWidgetsFusion(listeToMerge); + } + }); + + } }.start(); ; + // -- maj de la combo --// + // remplirCombo(); + + + + } + + + private EbliNode groupWidgetsFusion(final ArrayList<EbliNode> _selectedObjects) { + EbliWidgetFusionCalques parent = new EbliWidgetFusionCalques(scene_); + // -- il faut des gaps suffisants pour deplacer la widget et avoir le menu + // du groupe --// + Insets insetLayout = new Insets(30, 30, 30, 30); + // parent.setLayout(new OverlayLayout()); + parent.setLayout(new OverlayLayoutGap(insetLayout)); - // --suppression du calque de base --// - scene_.removeNodeWithEdges(nodeCalque_); + Point min = new Point(Integer.MAX_VALUE, Integer.MAX_VALUE); + Point max = new Point(-Integer.MAX_VALUE, -Integer.MAX_VALUE); + Rectangle sizeMax = new Rectangle(0, 0); + for (Object object : _selectedObjects) { + Widget findWidget = scene_.findWidget(object); + // Rectangle rec = findWidget.getBounds(); + Rectangle rec = findWidget.convertLocalToScene(findWidget.getBounds()); + min.x = Math.min(min.x, rec.x); + min.y = Math.min(min.y, rec.y); + max.x = Math.max(max.x, rec.x + rec.width); + max.y = Math.max(max.y, rec.y + rec.height); + + if (sizeMax.height < rec.height) + sizeMax.height = rec.height; + if (sizeMax.width < rec.width) + sizeMax.width = rec.width; + + } + int w = max.x - min.x; + int h = max.y - min.y; + Insets b = parent.getBorder().getInsets(); - scene_.refresh(); - // -- maj de la combo --// - remplirCombo(); + sizeMax.width += 2 * insetLayout.left; + sizeMax.height += 2 * insetLayout.bottom; + parent.setPreferredBounds(sizeMax); + parent.setPreferredSize(new Dimension(sizeMax.width, sizeMax.height)); + + + for (Object object : _selectedObjects) { + Widget findWidget = scene_.findWidget(object); + Rectangle widgetBounds = findWidget.getBounds(); + Rectangle rec = findWidget.convertLocalToScene(widgetBounds); + EbliWidget ew = (EbliWidget) findWidget; + ew.getController().removeActionResizeAndMove(); + + + + findWidget.removeFromParent(); + int dx = rec.x - min.x; + int dy = rec.y - min.y; + + Point pt = new Point(dx - widgetBounds.x, dy - widgetBounds.y); + findWidget.setPreferredLocation(pt); + parent.addChildCalque(ew); + float rMinX = ((float) dx) / w; + float rMinY = ((float) dy) / h; + float rMaxX = ((float) (w - widgetBounds.width - dx)) / w; + float rMaxY = ((float) (h - widgetBounds.height - dy)) / h; + parent.setChildConstraint(findWidget, new Rectangle2D.Float(rMinX, rMinY, rMaxX, rMaxY)); + + } + EbliWidgetGroupCreator creator = new EbliWidgetGroupCreator(); + + parent.setGroup(true); + creator.setW(parent); + + EbliNodeDefault node = new EbliNodeDefault(); + node.setPreferedLocation(min); + node.setTitle(EbliLib.getS("Fusion calquess")); + node.setCreator(creator); + parent.setController(new EbliWidgetControllerForGroup(parent)); + scene_.addNode(node); + scene_.setSelectedObjects(new HashSet(Arrays.asList(node))); + return node; } - + int cpt = 1; public void actionPerformed(ActionEvent _e) { // -- remplisage combo --// remplirCombo(); - - dialog_ = new BuDialogConfirmation(projet_.impl_.getApp(), projet_.impl_.getInformationsSoftware(), TrResource - .getS("Fusion avec un autre graphe")); + + dialog_ = new BuDialogMessage(projet_.impl_.getApp(), projet_.impl_.getInformationsSoftware(), TrResource + .getS("Fusion avec un autre graphe " + (cpt++))); if (content_ == null) content_ = constructPanel(); Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionFusionGraphes.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionFusionGraphes.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionFusionGraphes.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -27,7 +27,11 @@ import org.fudaa.ctulu.ProgressionInterface; import org.fudaa.ctulu.gui.CtuluTaskOperationGUI; import org.fudaa.ctulu.image.CtuluLibImage; +import org.fudaa.dodico.h2d.type.H2dVariableType; +import org.fudaa.ebli.courbe.EGCourbeChild; import org.fudaa.ebli.courbe.EGGraphe; +import org.fudaa.ebli.courbe.EGGrapheDuplicator; +import org.fudaa.ebli.courbe.EGGroup; import org.fudaa.ebli.ressource.EbliResource; import org.fudaa.ebli.visuallibrary.EbliNode; import org.fudaa.ebli.visuallibrary.EbliWidgetBordureSingle; @@ -36,6 +40,9 @@ import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe; import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetGraphe; import org.fudaa.ebli.visuallibrary.graphe.GrapheCellRenderer; +import org.fudaa.fudaa.meshviewer.profile.MVProfileCourbeModel; +import org.fudaa.fudaa.meshviewer.profile.MvProfileCourbe; +import org.fudaa.fudaa.meshviewer.profile.MvProfileCourbeGroup; import org.fudaa.fudaa.meshviewer.profile.MvProfileTreeModel; import org.fudaa.fudaa.tr.common.TrResource; @@ -215,16 +222,30 @@ public void act() { final ProgressionInterface prog = new ProgressionBuAdapter(this); - - //-- cas points reels --// - if (grapheToMerge.getObjIdx() != null && grapheToMerge.getObjIdx().length != 0) - grapheModel.addPoints(grapheToMerge.getObjIdx(), scene_.getCmdMng(), prog, grapheToMerge.getVarSupported()); - //-- cas interpol\xE9 --// - else if(grapheToMerge.getIntepolPt()!=null) - for (Iterator it = grapheToMerge.getIntepolPt().iterator(); it.hasNext();) - grapheModel.addPoints((TrPostInterpolatePoint) it.next(), scene_.getCmdMng(), prog, grapheToMerge - .getVarSupported()); + + + //-- parcours de la liste des variables du graphe a fusionner --// + for (Iterator<Object>it= grapheToMerge.getVarSupported().iterator();it.hasNext();) { + final H2dVariableType var = (H2dVariableType) it.next(); + + //-- on recherche le group associe a la variale dans l autre graphe sinon on le cree --// + EGGroup group = grapheModel.getGroupFor(var); + + //-- on recupere toutes les courbes associees a la var pour le graphe merges + final EGGroup g = grapheToMerge.getGroupFor(var); + for (int i = g.getChildCount() - 1; i >= 0; i--) { + if (g.getCourbeAt(i).getModel() instanceof TrPostCourbeModel) { + if (((TrPostCourbeModel) g.getCourbeAt(i).getModel()).getVar() == var) { + + // -- duplication de la courbe dans le groupe --// + group.addEGComponent((EGCourbeChild) g.getCourbeAt(i).duplicate(group, new EGGrapheDuplicator())); + } + } + + } + } + } }.start(); ; @@ -240,9 +261,45 @@ public void act() { final ProgressionInterface prog = new ProgressionBuAdapter(this); - grapheModel.addNewCourbe(scene_.getCmdMng(), widgetGraphe_.getPanelGraphe(), grapheObject, - projet_.impl_); + // grapheModel.addNewCourbe(scene_.getCmdMng(), + // widgetGraphe_.getPanelGraphe(), grapheObject, projet_.impl_); + + + //-- parcours de la liste des variables du graphe a fusionner --// + for (int i=0;i<grapheToMerge.target_.getVars().length;i++) { + final H2dVariableType var = (H2dVariableType) grapheToMerge.target_.getVars()[i]; + + // -- on recupere toutes les courbes associees a la var pour le + // graphe merges + final MvProfileCourbeGroup g = grapheToMerge.getGroup(var, false); + if (g != null) { + //-- on recherche le group associe a la variale dans l autre graphe sinon on le cree --// + MvProfileCourbeGroup group = grapheModel.getGroup(var, true); + + + for (int k = g.getChildCount() - 1; k >= 0; k--) { + if (g.getCourbeAt(k).getModel() instanceof MVProfileCourbeModel) { + if (((MVProfileCourbeModel) g.getCourbeAt(k).getModel()).getVariable() == var) { + + + // -- duplication de la courbe dans le groupe --// + MvProfileCourbe newChild = new MvProfileCourbe(group, (MVProfileCourbeModel) g.getCourbeAt(k) + .getModel().duplicate()); + + // group.addEGComponent((EGCourbeChild) + // g.getCourbeAt(k).duplicate(group, new + // EGGrapheDuplicator())); + + group.addEGComponent(newChild); + } + } + + } + } + + } + } }.start(); Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -413,6 +413,14 @@ } } + /** + * Determine les courbes qui correspondent a la variable et les stocke dans la + * liste _l. + * + * @param _var + * @param _l + * contient toutes les courbes qui appartiennent a la variable + */ void getCourbeFor(final H2dVariableType _var, final List _l) { final EGGroup g = getGroupFor(_var); for (int i = g.getChildCount() - 1; i >= 0; i--) { @@ -567,6 +575,13 @@ return true; } + /** + * Recherche ou cree un groupe correspondant a la variable pour eviter les + * doublons. + * + * @param _t + * @return + */ public EGGroup getGroupFor(final H2dVariableType _t) { if (_t == null) { return null; Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -31,7 +31,6 @@ import org.fudaa.ebli.visuallibrary.actions.CommandUndoRedoPaste; import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionConfigure; import org.fudaa.ebli.visuallibrary.calque.CalqueLegendeWidgetAdapter; -import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorFusionCalques; import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorLegende; import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque; import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe; @@ -460,16 +459,6 @@ // -- etape 2: rechargement de la toolbar specifique dans this --// changeToolbarSpecifiqueGraphe(node.getWidget().getController(), (EbliWidgetCreatorGraphe) node.getCreator()); - } else if (node.getCreator() instanceof EbliWidgetCreatorFusionCalques) { - - FuLog.warning("change tree Fusion de calques"); - // -- etape 1: ajout du tree dans fudaaImplementation --// - changeTree(node.getWidget().getController()); - - // -- etape 2: rechargement de la toolbar specifique dans this --// - changeToolbar(node.getWidget().getController()); - - } else { // -- etape 1: on fout eventuellement le tree des layouts --// changeTreeScene(); Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostScene.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostScene.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostScene.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -3,7 +3,6 @@ import org.fudaa.ebli.visuallibrary.EbliNode; import org.fudaa.ebli.visuallibrary.EbliScene; import org.fudaa.ebli.visuallibrary.EbliWidgetBordureSingle; -import org.fudaa.ebli.visuallibrary.calque.EbliWidgetFusionCalques; import org.fudaa.ebli.visuallibrary.calque.EbliWidgetVueCalque; import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetGraphe; import org.netbeans.api.visual.widget.Widget; @@ -53,10 +52,10 @@ new TrPostActionFusionCalques((EbliWidgetVueCalque) ((EbliWidgetBordureSingle) node.getWidget()).getIntern(), node, projet); - else if (((EbliWidgetBordureSingle) node.getWidget()).getIntern() instanceof EbliWidgetFusionCalques) - new TrPostActionFusionCalques((EbliWidgetFusionCalques) ((EbliWidgetBordureSingle) node.getWidget()) - .getIntern(), - node, projet); +// else if (((EbliWidgetBordureSingle) node.getWidget()).getIntern() instanceof EbliWidgetFusionCalques) +// new TrPostActionFusionCalques((EbliWidgetFusionCalques) ((EbliWidgetBordureSingle) node.getWidget()) +// .getIntern(), +// node, projet); } else { @@ -67,8 +66,8 @@ } else if (node.getWidget() instanceof EbliWidgetVueCalque) { new TrPostActionFusionCalques((EbliWidgetVueCalque) node.getWidget(), node, projet); - } else if (node.getWidget() instanceof EbliWidgetFusionCalques) { - new TrPostActionFusionCalques((EbliWidgetFusionCalques) node.getWidget(), node, projet); +// } else if (node.getWidget() instanceof EbliWidgetFusionCalques) { +// new TrPostActionFusionCalques((EbliWidgetFusionCalques) node.getWidget(), node, projet); } } Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostWizardCourbeTemporelle.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostWizardCourbeTemporelle.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostWizardCourbeTemporelle.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -434,7 +434,7 @@ content.add(actionChoixGraphes_.getInterfacePartielle(false, false, false), BorderLayout.CENTER); JPanel bouttonCenter = new JPanel(new FlowLayout(FlowLayout.CENTER)); bouttonCenter.add(creationNewGraphe_); - content.add(bouttonCenter, BorderLayout.SOUTH); + content.add(bouttonCenter, BorderLayout.NORTH); if (actionChoixGraphes_.listeGraphesPossibles.size() == 0 && actionChoixGraphes_.listeGraphesChoisis.size() == 0) { creationNewGraphe_.setSelected(true); creationNewGraphe_.setEnabled(false); Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostWizardProfilSpatial.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostWizardProfilSpatial.java 2008-09-16 15:35:12 UTC (rev 3931) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostWizardProfilSpatial.java 2008-09-16 17:12:47 UTC (rev 3932) @@ -185,10 +185,16 @@ content.add(actionChoixGraphes_.getInterfacePartielle(false, false, false), BorderLayout.CENTER); JPanel bouttonCenter = new JPanel(new FlowLayout(FlowLayout.CENTER)); bouttonCenter.add(creationNewGraphe_); - content.add(bouttonCenter, BorderLayout.SOUTH); + content.add(bouttonCenter, BorderLayout.NORTH); content.setBorder(CtuluLibSwing.createTitleBorder(CtuluLib.getS("Etape 3: S\xE9lection et cr\xE9ation des graphes"))); + if (actionChoixGraphes_.listeGraphesPossibles.size() == 0 && actionChoixGraphes_.listeGraphesChoisis.size() == 0) { + creationNewGraphe_.setSelected(true); + creationNewGraphe_.setEnabled(false); + actionChoixGraphes_.setEnabled(false); + } + return content; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bma...@us...> - 2008-09-16 15:37:01
|
Revision: 3931 http://fudaa.svn.sourceforge.net/fudaa/?rev=3931&view=rev Author: bmarchan Date: 2008-09-16 15:35:12 +0000 (Tue, 16 Sep 2008) Log Message: ----------- modif property svn:eol-style Modified Paths: -------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCheckBox3States.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/CtuluArkLoader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/CtuluLibGeometrie.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFilterAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneAttributeFactory.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionMultiPoint.java Property Changed: ---------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/SWFActionCodes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/Unprotector.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFActions.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFFileSignature.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFHeader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFShape.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFTags.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFText.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/interfaces/SWFVectors.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Actions.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Button.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/CtuluMovieImmediateSave.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/EditField.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/ExportedSymbol.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Font.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/FontDefinition.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/FontLoader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Frame.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Image.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/ImageUtil.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/ImportedSymbol.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Instance.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/MorphShape.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Movie.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/MovieClip.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Placement.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/QTMovie.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Shape.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Symbol.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Text.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/TimeLine.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/movie/Transform.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/readers/ActionParser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/readers/SWFReader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/sound/ADPCMConstants.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/sound/ADPCMEncodeStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/sound/ADPCMHelper.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/sound/MP3Frame.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/sound/MP3Helper.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/sound/RawHelper.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/structs/AlphaColor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/structs/AlphaTransform.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/structs/ButtonRecord.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/structs/ButtonRecord2.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/structs/Color.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/structs/ColorTransform.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/structs/FillStyle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/structs/LineStyle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/structs/Matrix.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/structs/Rect.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/structs/SoundInfo.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/structs/Style.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/writers/ActionTextWriter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/writers/ActionWriter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/writers/DummySWFWriter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/writers/SWFActionsImpl.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/flash/writers/SWFWriter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/io/Byte4ByteDebugStreams.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/io/CountingOutputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/io/InStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/io/OutStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/io/OutputStreamWrapper.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/util/Base64.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/anotherbigidea/util/Hex.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/diaam/lgpl/applications/ScriptsStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/diaam/lgpl/applications/ScriptsWays.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/diaam/lgpl/script/Interpretable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/diaam/lgpl/script/TextWays.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/diaam/lgpl/ts/ActionSauvegarde.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/diaam/lgpl/ts/MinReader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/diaam/lgpl/ts/ShSh.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/diaam/lgpl/ts/SwingTextDocumentWriter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/diaam/lgpl/ts/TerminalStandard.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/Ekit.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/EkitCore.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/FudaaAlignAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/action/CustomAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/action/FormatAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/action/ListAutomationAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/action/SetFontFamilyAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/action/StylesAction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/ExtendedHTMLDocument.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/ExtendedHTMLEditorKit.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/FontSelectorDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/HTMLUtilities.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/ImageDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/ImageFileChooser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/ImageFileChooserPreview.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/ImageURLDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/JButtonNoFocus.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/JComboBoxNoFocus.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/JToggleButtonNoFocus.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/MutableFilter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/PropertiesDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/RelativeImageView.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/SearchDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/SimpleInfoDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/TableInputDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/UnicodeDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/UserInputAnchorDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/ekit/component/UserInputDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/util/Base64Codec.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/hexidec/util/Translatrix.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/acme/AcmeGifEncoder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/acme/AcmeImageEncoder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/acme/AcmeIntHashtable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/acme/AcmeJpegEncoder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/acme/AcmePpmEncoder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/acme/CtuluGif89EncoderImmediateSave.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/acme/DirectGif89Frame.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/acme/Gif89Encoder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/acme/Gif89Frame.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/acme/GifColorTable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/acme/IndexGif89Frame.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/acme/Put.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/ant/cpp_task.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/ant/date_task.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/ant/idlj_task.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/Bu.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuAbilityInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuAbstractCellRenderer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuAbstractDropPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuAbstractPreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuActionChecker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuActionEnabler.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuActionRemover.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuApplet.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuApplication.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuAssistant.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuAutoStyledDocument.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuBackgroundPainter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuBmpLoader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuBorderLayout.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuBorders.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuBrowserControl.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuBrowserFrame.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuBrowserPane.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuBrowserPreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuButton.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuButtonLayout.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuButtonPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCharValidator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCheckBox.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCheckBox3States.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCheckBoxMenuItem.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCollapsablePanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuColorChooser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuColorIcon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuColumn.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuComboBox.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCommandPreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCommonImplementation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCommonInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuComposedIcon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuContentFrame.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCropBorder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCutCopyPasteInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDesktop.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDesktopManager.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDesktopPreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDialogChoice.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDialogConfirmation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDialogError.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDialogException.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDialogFind.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDialogInput.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDialogList.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDialogMessage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDialogMulti.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDialogReplace.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDialogWarning.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDirWinPreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDrawer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuDynamicMenu.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuEditorPane.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuEmptyIcon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuEmptyList.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuExplorer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFileChooser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFileDropPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFileExtensions.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFileFilter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFileFilterAll.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFileFilterDirectory.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFileRenderer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFileViewer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFilters.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFixedSizeIcon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFixedSizeImageIcon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFontChooser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFontDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFormLayout.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuFrameImage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuGenericPreferencesModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuGenericPreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuGlassPaneHelp.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuGlassPaneStop.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuGlobalFilter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuGridLayout.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuHeaderPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuHelpFrame.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuHorizontalLayout.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuIcon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuIconChooser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuIconPreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuInformationsAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuInformationsDocument.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuInformationsPerson.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuInformationsSoftware.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuInformationsUser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuInsets.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuInternalFrame.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuLabel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuLabelInfo.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuLabelLink.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuLabelMultiLine.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuLanguagePreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuLazyIcon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuLightBorder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuList.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuLookPreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMacEnv.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMainPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMenu.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMenuBar.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMenuInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMenuInternalFrames.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMenuItem.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMenuLayout.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMenuRecentFiles.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMenuTools.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMetalCustomTheme.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMonitorAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMonitorClock.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMonitorCpu.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMonitorMemory.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMonitorPreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMonitorTime.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMultiFormLayout.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuMultiLabel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuNumericValueValidator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuOptionItem.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuOptionRenderer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuOverlayLayout.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPalette.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPasswordField.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPicture.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPopupButton.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPopupMenu.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPopupWindow.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPreferences.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPreferencesCategory.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPreferencesDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPreferencesFrame.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPreferencesInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPreferencesMainPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPreviewFrame.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPreviewJob.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPrintable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuPrinter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuProgressBar.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuRadioButton.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuRadioButtonMenuItem.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuRegistry.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuResource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuRobustIcon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuScriptPreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuScrollPane.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuSelectFindReplaceInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuSeparator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuShadowFilter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuShell.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuSlafCustomTheme.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuSlider.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuSpecificBar.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuSplashScreen.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuSplit2Pane.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuSplit3Pane.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuSplitPane.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuStatusBar.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuStringDropPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuStringValidator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuSubApp.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTabbedPane.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTableCellEditor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTableCellRenderer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTableColumnHeader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTableDelegateModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTableRowHeader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTableRowHeaderRenderer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTableSortModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTableStaticModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTableVectorModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTask.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTaskOperation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTaskView.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTerminal.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTerminalDisplay.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTerminalKey.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTextArea.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTextComponentInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTextField.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTextPane.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTextureIcon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTimer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTitledBorder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTitledPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuToggleButton.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuToolBar.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuToolButton.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuToolToggleButton.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuToolsModel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuToolsPreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTranslatedIcon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTranslatorInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTransparentButton.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTransparentToggleButton.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuTree.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuUndoRedoInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuUpdateGUI.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuUserPreferencesPanel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuValueValidator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuVerticalLayout.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuVfsOperations.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuWizardDialog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuWizardTask.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuWizardTaskSample.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bzip/BZip2CRC.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bzip/BZip2Constants.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bzip/BZip2InputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bzip/BZip2OutputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/Dja.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaAnchor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaArcArrow.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaAttach.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaBezierArrow.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaBox.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaBrokenArrow.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaCircle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaCoder.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaColor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaControl.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaConvertDia.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaDiamond.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaDirectArrow.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaEllipse.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaEmbed.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaFont.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaForm.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaFrame.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaGraphics.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaGraphics0.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaGraphics1.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaGraphics2.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaGrid.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaGridAdapter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaGridEvent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaGridInteractive.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaGridListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaGroup.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaHLine.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaHandle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaIcon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaImage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaImplementation.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaKeyListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLabel.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLayoutCircle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLayoutDiagonale.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLayoutDiamond.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLayoutInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLayoutTree.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLibDetect.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLink.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLoadSaveDia.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLoadSaveDja.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLoadSaveGif.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLoadSaveImage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLoadSaveInterface.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLoadSaveJpg.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLoadSaveLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLoadSavePng.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLoadSavePpm.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLoadSaveSer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaLoader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaManipulator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaMatrixHermite.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaMouseListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaNode.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaObject.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaOptions.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaOwner.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaPaletteBracket.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaPaletteForm.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaPaletteLink.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaPaletteStroke.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaPaletteThickness.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaPaletteUml.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaPoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaPreferences.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaRegistry.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaResource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaRoundBox.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaSaver.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaSquare.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaSubApp.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaText.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaTree.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaUmlActor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaUmlBranch.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaUmlClass.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaUmlClassIcon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaUmlComponent.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaUmlJoin.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaUmlLargePackage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaUmlLifeline.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaUmlNode.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaUmlNote.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaUmlObject.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaUmlSmallPackage.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaUmlState.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaUmlUsecase.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaVLine.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaVector.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dja/DjaZigZagArrow.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndConstants.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndIcons.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndManageBackground.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndManageData.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndManageProperty.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndManageText.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndModes.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndMultiIcon.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndProperty.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndRequestData.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndRequestItem.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndRequestObject.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndRequestSelection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndSensible.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndSource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndTarget.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndTest.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndTransferData.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndTransferObject.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dnd/DndTransferString.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtColorSelection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtDragSensible.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtDragSupport.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtDropAbstract.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtDropBasic.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtDropDisabler.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtDropReady.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtFileFieldHandler.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtFileHandler.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtFilesSelection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtFontHandler.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtFontSelection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtImageSelection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtStringFieldHandler.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/dt/DtStringsSelection.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/Fu.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuCharsets.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuClassLoaderDedicated.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuComparator.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuCompletor.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuEmptyArrays.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuEmptyInputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuFactoryBoolean.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuFactoryByteArray.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuFactoryInteger.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuFactoryLong.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuHashtableFast.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuHashtablePublic.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuHtml.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuLimitedInputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuLog.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuMD5.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuNullOutputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuNullPrintStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuPreferences.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuRefTable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuResource.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuSHA1.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuSoftCache.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuSort.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuSortint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuSoundex.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuStreamTokenizer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuText.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuUnicodeFilterInputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuUnicodeFilterOutputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuUnicodeFilterReader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuUnicodeFilterWriter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuVectorFast.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuVectorPublic.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuVectorString.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuVectordouble.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuVectorint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuVectorlong.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/fu/FuWeakCache.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditBatchFileTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditCCTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditCTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditDefaultInputHandler.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditEiffelTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditHTMLTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditIDLTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditInputHandler.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditJavaScriptTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditJavaTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditKeywordMap.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditMakefileTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditPatchTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditPerlTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditPropsTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditPythonTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditSQLTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditShellScriptTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditSyntaxDocument.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditSyntaxStyle.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditSyntaxUtilities.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditTSQLTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditTeXTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditTextArea.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditTextAreaDefaults.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditTextAreaPainter.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditTextUtilities.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditToken.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/jedit/JEditXMLTokenMarker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/mst/MstHandlerBase.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/mst/MstXmlException.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/mst/MstXmlHandler.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/mst/MstXmlParser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RE.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RECharIndexed.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RECharIndexedCharArray.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RECharIndexedInputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RECharIndexedString.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RECharIndexedStringBuffer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/REException.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/REFilterInputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/REMatch.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/REMatchEnumeration.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RESyntax.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/REToken.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RETokenAny.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RETokenBackRef.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RETokenChar.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RETokenEnd.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RETokenOneOf.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RETokenPOSIX.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RETokenRange.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RETokenRepeated.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/re/RETokenStart.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/tar/TarEntry.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/tar/TarFile.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/tar/TarInputStream.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vacvs/VACvsClient.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vacvs/VAProperties.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsCache.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsFile.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsFileFile.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsFileFtp.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsFileHttp.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsFileRam.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsFileTar.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsFileTracker.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsFileUrl.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsFileZip.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsOperations.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsRamDisk.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsUrlBzip2.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsUrlData.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsUrlGzip.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsUrlRam.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsUrlTar.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/vfs/VfsUrlZip.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/xml/XmlLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/xml/XmlListener.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/xml/XmlNode.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/xml/XmlParser.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/xml/XmlReader.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodAbstractComputeQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodAbstractQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodAbstractTestQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodAccessQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodAssoc.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodAvgQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodCacheQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodCastQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodCategoriesQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodClassQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodCloneQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodCollector.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodCompareQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodConstants.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodCountQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodCrossQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodDatabase.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodDeserializer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodDifferenceQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodDistinctQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodDummyQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodElementQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodExplodeQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodExternalQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodFlattenQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodGroupQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodInQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodIntersectionQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodIntervalQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodLib.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodMapQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodMathQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodMaxQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodMinQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodNumberQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodPair.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodQuery.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodRedSerializer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodReference.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodSecurityManager.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodSerDeserializer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodSerSerializer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/yapod/YapodSerializer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/... [truncated message content] |
From: <bma...@us...> - 2008-09-16 15:22:59
|
Revision: 3930 http://fudaa.svn.sourceforge.net/fudaa/?rev=3930&view=rev Author: bmarchan Date: 2008-09-16 14:37:32 +0000 (Tue, 16 Sep 2008) Log Message: ----------- modif property svn:eol-style Property Changed: ---------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionPoint.java Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionPoint.java ___________________________________________________________________ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bma...@us...> - 2008-09-16 15:22:10
|
Revision: 3929 http://fudaa.svn.sourceforge.net/fudaa/?rev=3929&view=rev Author: bmarchan Date: 2008-09-16 14:32:22 +0000 (Tue, 16 Sep 2008) Log Message: ----------- modif property svn:eol-style Property Changed: ---------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneListener.java Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneListener.java ___________________________________________________________________ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bma...@us...> - 2008-09-16 11:05:29
|
Revision: 3928 http://fudaa.svn.sourceforge.net/fudaa/?rev=3928&view=rev Author: bmarchan Date: 2008-09-16 11:05:38 +0000 (Tue, 16 Sep 2008) Log Message: ----------- Optimisation de la vitesse de traitement lors de la suppression d'un multipoint Modified Paths: -------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneAttributeFactory.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionGeometry.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionMultiPoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttibutesContainer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttributesDataI.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeEditable.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneAttributeFactory.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneAttributeFactory.java 2008-09-16 07:47:06 UTC (rev 3927) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneAttributeFactory.java 2008-09-16 11:05:38 UTC (rev 3928) @@ -9,7 +9,6 @@ import java.util.Arrays; -import com.sun.j3d.loaders.vrml97.impl.Coordinate; import com.vividsolutions.jts.geom.Geometry; import com.vividsolutions.jts.geom.LineString; @@ -31,7 +30,7 @@ * @return l'interpolateur 1d */ public static GISReprojectInterpolateurI create1DInterpolateur(final GISAttributeInterface _att, - final LineString _src, final LineString _target, final GISAttributeModel _model) { + final GISCoordinateSequenceContainerInterface _src, final GISCoordinateSequenceContainerInterface _target, final GISAttributeModel _model) { final Class clazz = _att.getDataClass(); if (clazz == Integer.class) { return new GISReprojectInterpolateur1DInteger(_src.getCoordinateSequence(), _target.getCoordinateSequence(), @@ -49,40 +48,6 @@ } - /** - * @param _att l'attribut - * @param _src la liste des points source - * @param _target la liste des points cible - * @param _model le model initial - * @return l'interpolateur 1d - */ - public static GISReprojectInterpolateurI create1DInterpolateur(final GISAttributeInterface _att, - final Geometry _src, final Geometry _target, final GISAttributeModel _model) { - final Class clazz = _att.getDataClass(); - if (clazz == Integer.class) { - return new GISReprojectInterpolateur1DInteger( - new GISCoordinateSequence(_src.getCoordinates()), - new GISCoordinateSequence(_target.getCoordinates()), - (GISAttributeModelIntegerInterface) _model); - } else if (clazz == Double.class) { - return new GISReprojectInterpolateur1DDouble( - new GISCoordinateSequence(_src.getCoordinates()), - new GISCoordinateSequence(_target.getCoordinates()), - (GISAttributeModelDoubleInterface) _model); - } else if (clazz == Boolean.class) { - return new GISReprojectInterpolateur1DBoolean( - new GISCoordinateSequence(_src.getCoordinates()), - new GISCoordinateSequence(_target.getCoordinates()), - (GISAttributeModelBooleanInterface) _model); - } else { - return new GISReprojectInterpolateur1DObject( - new GISCoordinateSequence(_src.getCoordinates()), - new GISCoordinateSequence(_target.getCoordinates()), - (GISAttributeModelObjectInterface) _model); - } - - } - public static GISAttributeModel createModelList(final GISAttributeInterface _att, final Object _valatt, final int _capacity, final GISAttributeListener _listener, final int _initValuesNb) { final GISAttributeModelListener resfinal = _att.createListModel(_capacity); Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionGeometry.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionGeometry.java 2008-09-16 07:47:06 UTC (rev 3927) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionGeometry.java 2008-09-16 11:05:38 UTC (rev 3928) @@ -129,7 +129,7 @@ } geom = GISGeometryFactory.INSTANCE.createGeometry(geom.getClass(),cs); - setValue(_ligneIdx,geom, _cmd); + setGeometry(_ligneIdx,geom, _cmd); } /** @@ -137,7 +137,7 @@ * @param _geom la nouvelle ligne * @param _cmd le receveur de commande */ - public void setValue(final int _idx, final Geometry _geom, final CtuluCommandContainer _cmd) { + public void setGeometry(final int _idx, final Geometry _geom, final CtuluCommandContainer _cmd) { if (!isGeomModifiable_) { return; } @@ -150,8 +150,9 @@ final GISAttributeInterface att = getAttribute(i); if (att.isAtomicValue()) { final GISAttributeModel m = (GISAttributeModel) (getModelListener(i).getObjectValueAt(_idx)); - final GISReprojectInterpolateurI interpolateur = GISZoneAttributeFactory.create1DInterpolateur(att, old, - _geom, m); + final GISReprojectInterpolateurI interpolateur = GISZoneAttributeFactory.create1DInterpolateur(att, + (GISCoordinateSequenceContainerInterface)old, + (GISCoordinateSequenceContainerInterface)_geom, m); getModelListener(i).setObject(_idx, m.deriveNewModel(_geom.getNumPoints(), interpolateur), cmp); } } Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java 2008-09-16 07:47:06 UTC (rev 3927) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java 2008-09-16 11:05:38 UTC (rev 3928) @@ -94,8 +94,9 @@ final GISAttributeInterface att = getAttribute(i); if (att.isAtomicValue()) { final GISAttributeModel m = (GISAttributeModel) (getModelListener(i).getObjectValueAt(_idx)); - final GISReprojectInterpolateurI interpolateur = GISZoneAttributeFactory.create1DInterpolateur(att, old, - _newLine, m); + final GISReprojectInterpolateurI interpolateur = GISZoneAttributeFactory.create1DInterpolateur(att, + (GISCoordinateSequenceContainerInterface)old, + (GISCoordinateSequenceContainerInterface)_newLine, m); getModelListener(i).setObject(_idx, m.deriveNewModel(_newLine.getNumPoints(), interpolateur), cmp); } } Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionMultiPoint.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionMultiPoint.java 2008-09-16 07:47:06 UTC (rev 3927) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionMultiPoint.java 2008-09-16 11:05:38 UTC (rev 3928) @@ -190,9 +190,7 @@ } return true; } - /** - * @todo Les poly de niveau sont mal trait\xE9es - */ + public void addAtomic(final int _ligneIdx, final int _idxBefore, final double _x, final double _y, final CtuluCommandContainer _cmd) { if (!isGeomModifiable_) { @@ -211,33 +209,34 @@ } geom = GISGeometryFactory.INSTANCE.createMultiPoint(cs); - setValue(_ligneIdx,geom, _cmd); + setGeometry(_ligneIdx,geom, _cmd); } /** - * @param _idx l'indice de la ligne a changer - * @param _geom la nouvelle ligne + * @param _idxGeom l'indice de la g\xE9om\xE9trie a remplacer + * @param _geom la nouvelle g\xE9ometrie * @param _cmd le receveur de commande */ - public void setValue(final int _idx, final Geometry _geom, final CtuluCommandContainer _cmd) { + public void setGeometry(final int _idxGeom, final Geometry _geom, final CtuluCommandContainer _cmd) { if (!isGeomModifiable_) { return; } - final Geometry old = (Geometry) super.geometry_.getValueAt(_idx); + final Geometry old = (Geometry) super.geometry_.getValueAt(_idxGeom); if (old.getNumPoints() == _geom.getNumPoints() || !containsAtomicAttribute()) { - super.geometry_.setObject(_idx, _geom, _cmd); + super.geometry_.setObject(_idxGeom, _geom, _cmd); } else { final CtuluCommandComposite cmp = new CtuluCommandComposite(); for (int i = getNbAttributes() - 1; i >= 0; i--) { final GISAttributeInterface att = getAttribute(i); if (att.isAtomicValue()) { - final GISAttributeModel m = (GISAttributeModel) (getModelListener(i).getObjectValueAt(_idx)); - final GISReprojectInterpolateurI interpolateur = GISZoneAttributeFactory.create1DInterpolateur(att, old, - _geom, m); - getModelListener(i).setObject(_idx, m.deriveNewModel(_geom.getNumPoints(), interpolateur), cmp); + final GISAttributeModel m = (GISAttributeModel) (getModelListener(i).getObjectValueAt(_idxGeom)); + final GISReprojectInterpolateurI interpolateur = GISZoneAttributeFactory.create1DInterpolateur(att, + (GISCoordinateSequenceContainerInterface)old, + (GISCoordinateSequenceContainerInterface)_geom, m); + getModelListener(i).setObject(_idxGeom, m.deriveNewModel(_geom.getNumPoints(), interpolateur), cmp); } } - super.geometry_.setObject(_idx, _geom, cmp); + super.geometry_.setObject(_idxGeom, _geom, cmp); if (_cmd != null) { _cmd.addCmd(cmp.getSimplify()); } @@ -387,34 +386,14 @@ return false; } -// /** -// * @return true si contient au moins un polygone (ligne brisee fermee). -// */ -// public boolean containsPolygone() { -// final GISVisitorChooser chooser = new GISVisitorChooser(); -// for (int i = getNumGeometries() - 1; i >= 0; i--) { -// ((GISGeometry) getGeometry(i)).accept(chooser); -// if (chooser.isPolygone()) { -// return true; -// } -// } -// return false; -// } -// -// /** -// * @return true si contient au moins un polygone (ligne brisee fermee). -// */ -// public boolean containsPolyligne() { -// final GISVisitorChooser chooser = new GISVisitorChooser(); -// for (int i = getNumGeometries() - 1; i >= 0; i--) { -// ((GISGeometry) getGeometry(i)).accept(chooser); -// if (chooser.isPolyligne()) { -// return true; -// } -// } -// return false; -// } -// + /** + * Supprime des sommets sur une g\xE9om\xE9trie. + * @param _idxGeom L'indice de la g\xE9om\xE9trie. + * @param _sel La liste des sommets s\xE9lectionn\xE9s. + * @param _ui L'interface utilisateur. + * @param _cmd Le manager de commandes. + * @return true si tout s'est bien pass\xE9. + */ public boolean removeAtomics(final int _idxGeom, final CtuluListSelectionInterface _sel, final CtuluUI _ui, final CtuluCommandContainer _cmd) { if (_sel == null || _sel.isEmpty()) { @@ -423,11 +402,19 @@ boolean r = true; final Geometry old = (Geometry) getGeometry(_idxGeom); int nbPt = old.getNumPoints(); + + // Raccourci si tous les sommets sont s\xE9lectionn\xE9s. + int nbSel=_sel.getNbSelectedIndex(); + if (nbSel==nbPt) { + removeGeometries(new int[]{_idxGeom}, _cmd); + return true; + } + // les nouvelles coordonnees. - final Coordinate[] newCs = new Coordinate[nbPt]; + final Coordinate[] newCs = new Coordinate[nbPt-nbSel]; // cette liste contient les indice a enlever : creee que si necessaire // si des attribute atomics existent - final TIntArrayList idxToRemove = containsAtomicAttribute() ? new TIntArrayList(nbPt) : null; + final TIntArrayList idxToRemove = containsAtomicAttribute() ? new TIntArrayList(nbPt-nbSel) : null; // compteur tempo int count = 0; @@ -437,69 +424,27 @@ idxToRemove.add(idxPt); } } else { - newCs[count++] = (Coordinate)old.getCoordinates()[idxPt].clone(); + newCs[count++] = ((GISCoordinateSequenceContainerInterface)old).getCoordinateSequence().getCoordinate(idxPt); } } - GISMultiPoint newGeom = null; - -// // Un polygone -// if (line/*.isClosed()*/ instanceof GISPolygone) { -// if (count < 3) { -// r = false; -// if (_ui != null) { -// _ui.error(null, CtuluLib.getS("La ligne brisee doit contenir {0} points au moins", CtuluLibString.TROIS), -// false); -// } -// -// } else { -// newCs[count++] = newCs[0]; -// final Coordinate[] coord = new Coordinate[count]; -// System.arraycopy(newCs, 0, coord, 0, coord.length); -// newString = GISGeometryFactory.INSTANCE.createLinearRing(coord); -// newString.setUserData(line.getUserData()); -// } -// } -// -// // Une polyligne -// else if (line instanceof GISPolyligne && ((GISPolyligne)line).isReliee()) { -// if (count < 2) { -// r = false; -// if (_ui != null) { -// _ui.error(null, CtuluLib.getS("La ligne brisee doit contenir {0} points au moins", CtuluLibString.DEUX), -// false); -// } -// if (FuLog.isTrace()) { -// FuLog.trace("EBLI: polylignes: not enough points"); -// // message -// } -// } else { -// final Coordinate[] coord = new Coordinate[count]; -// System.arraycopy(newCs, 0, coord, 0, coord.length); -// newString = GISGeometryFactory.INSTANCE.createLineString(coord); -// newString.setUserData(line.getUserData()); -// } -// } - - // Une polyligne non reliee -// else if (line instanceof GISPolyligne && !((GISPolyligne)line).isReliee()) { - if (count < 1) { - r = false; - if (_ui != null) { - _ui.error(null, CtuluLib.getS("La ligne non reliee doit contenir {0} points au moins", CtuluLibString.UN), - false); - } - if (FuLog.isTrace()) { - FuLog.trace("EBLI: polylignes: not enough points"); - // message - } - } else { - final Coordinate[] coord = new Coordinate[count]; - System.arraycopy(newCs, 0, coord, 0, coord.length); - newGeom = (GISMultiPoint)GISGeometryFactory.INSTANCE.createMultiPoint(coord); -// ((GISPolyligne)newString).setReliee(false); - newGeom.setUserData(old.getUserData()); + GISMultiPoint newGeom=null; + if (count<1) { + r=false; + if (_ui!=null) { + _ui.error(null, CtuluLib.getS("La ligne non reliee doit contenir {0} points au moins", CtuluLibString.UN), false); } -// } + if (FuLog.isTrace()) { + FuLog.trace("EBLI: polylignes: not enough points"); + // message + } + } + else { +// final Coordinate[] coord=new Coordinate[count]; +// System.arraycopy(newCs, 0, coord, 0, coord.length); + newGeom=(GISMultiPoint)GISGeometryFactory.INSTANCE.createMultiPoint(newCs); + newGeom.setUserData(old.getUserData()); + } + if (r) { super.geometry_.setObject(_idxGeom, newGeom, _cmd); // si des attributs atomics sont concerne Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttibutesContainer.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttibutesContainer.java 2008-09-16 07:47:06 UTC (rev 3927) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttibutesContainer.java 2008-09-16 11:05:38 UTC (rev 3928) @@ -94,11 +94,11 @@ nbGeom_++; } - public int getNumGeometry() { + public int getNbVertex() { return nbGeom_; } - public int getNumValues() { + public int getNbValues() { return name_.length; } @@ -169,11 +169,11 @@ } } - public int getNumGeometry() { + public int getNbVertex() { return 1; } - public int getNumValues() { + public int getNbValues() { return name_.length; } Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttributesDataI.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttributesDataI.java 2008-09-16 07:47:06 UTC (rev 3927) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttributesDataI.java 2008-09-16 11:05:38 UTC (rev 3928) @@ -18,12 +18,12 @@ /** * @return Nombre de sommets de la g\xE9om\xE9trie en cours. */ - public abstract int getNumGeometry(); + public abstract int getNbVertex(); /** * @return Le nombre de valeurs d'attribut par sommet. */ - public abstract int getNumValues(); + public abstract int getNbValues(); /** * @param _i L'index d'attribut [0,getNbValues()] @@ -32,20 +32,22 @@ public abstract GISAttributeInterface getAttribute(int _i); /** - * Retourne la valeur pour l'attribut et le sommet. + * Retourne la valeur pour l'attribut et le sommet. Si l'attribut est global, le num\xE9ro de sommet + * n'a pas d'importance. + * * @param _attr La definition d'attribut - * @param _numGeometry Le sommet. + * @param _idxVertex Le sommet. * @return La valeur atomique pour le sommet. */ - public abstract Object getValue(GISAttributeInterface _attr,int _numGeometry); + public abstract Object getValue(GISAttributeInterface _attr,int _idxVertex); /** * Definit la valeur pour l'attribut et le sommet. * @param _attr La definition d'attribut - * @param _numGeometry Le sommet. + * @param _idxVertex Le sommet. * @param _val La valeur atomique. */ - public abstract void setValue(GISAttributeInterface _attr,int _numGeometry,Object _val); + public abstract void setValue(GISAttributeInterface _attr,int _idxVertex, Object _val); /** * Ajout d'un sommet, et cr\xE9ation des valeurs d'attributs en consequence. Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeEditable.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeEditable.java 2008-09-16 07:47:06 UTC (rev 3927) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleLigneBriseeEditable.java 2008-09-16 11:05:38 UTC (rev 3928) @@ -61,7 +61,7 @@ for (int i = r.length - 1; i >= 0; i--) { final GISAttributeInterface att = geometries_.getAttribute(i); if (att.isAtomicValue()) { - final Object[] ri = new Object[_d.getNumGeometry()]; + final Object[] ri = new Object[_d.getNbVertex()]; for (int gi = ri.length - 1; gi >= 0; gi--) { ri[gi] = _d.getValue(att, gi); if (FuLog.isTrace()) { Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java 2008-09-16 07:47:06 UTC (rev 3927) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java 2008-09-16 11:05:38 UTC (rev 3928) @@ -402,9 +402,17 @@ } } - public void addAtomic(final int _ligneIdx,final int _idxBefore,final double _x,final double _y,final CtuluCommandContainer _cmd){ + /** + * Ajoute un sommet X,Y \xE0 la g\xE9om\xE9trie donn\xE9e. Les valeurs des attributs sont interpol\xE9es \xE9ventuellement. + * @param _idxGeom La g\xE9om\xE9trie modifi\xE9e. + * @param _idxBefore Le sommet qui sera le pr\xE9cedent de celui ajout\xE9. + * @param _x La coordonn\xE9e X du point. + * @param _y La coordonn\xE9e Y du point. + * @param _cmd Le manager de commandes. + */ + public void addAtomic(final int _idxGeom,final int _idxBefore,final double _x,final double _y,final CtuluCommandContainer _cmd){ if (geometries_ == null) return; - geometries_.addAtomic(_ligneIdx, _idxBefore, _x, _y, _cmd); + geometries_.addAtomic(_idxGeom, _idxBefore, _x, _y, _cmd); } protected GISZoneCollectionMultiPoint createCollection(){ @@ -456,7 +464,7 @@ for (int i = r.length - 1; i >= 0; i--) { final GISAttributeInterface att = geometries_.getAttribute(i); if (att.isAtomicValue()) { - final Object[] ri = new Object[_d.getNumGeometry()]; + final Object[] ri = new Object[_d.getNbVertex()]; for (int gi = ri.length - 1; gi >= 0; gi--) { ri[gi] = _d.getValue(att, gi); if (FuLog.isTrace()) { @@ -523,7 +531,7 @@ } final GISMultiPoint geo = (GISMultiPoint) GISGeometryFactory.INSTANCE.createMultiPoint(newSeq); - geometries_.setValue(i, geo, cmp); + geometries_.setGeometry(i, geo, cmp); } } if (_cmd != null) { @@ -667,7 +675,7 @@ } return false; } - geometries_.setValue(idx, geo, cmp); + geometries_.setGeometry(idx, geo, cmp); if (newvals!=null) getGeomData().getModel(zAtt).setObject(idx, newvals, cmp); @@ -740,7 +748,7 @@ newSeq[j].y=dynew+_yreel0; } final GISMultiPoint poly = (GISMultiPoint) GISGeometryFactory.INSTANCE.createMultiPoint(newSeq); - geometries_.setValue(i, poly, cmp); + geometries_.setGeometry(i, poly, cmp); } } @@ -794,7 +802,7 @@ } return false; } - geometries_.setValue(idx, geo, cmp); + geometries_.setGeometry(idx, geo, cmp); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fa...@us...> - 2008-09-16 07:46:55
|
Revision: 3927 http://fudaa.svn.sourceforge.net/fudaa/?rev=3927&view=rev Author: fargeix Date: 2008-09-16 07:47:06 +0000 (Tue, 16 Sep 2008) Log Message: ----------- Ajout des attentes cumul?\195?\169es dans les deux sens Modified Paths: -------------- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatComparaisonAttenteElement.java Modified: trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatComparaisonAttenteElement.java =================================================================== --- trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatComparaisonAttenteElement.java 2008-09-15 16:57:44 UTC (rev 3926) +++ trunk/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatComparaisonAttenteElement.java 2008-09-16 07:47:06 UTC (rev 3927) @@ -155,15 +155,15 @@ /** * combolist qui permet de selectionenr les lignes deu tableau a etre affich\xE9es: */ - String[] listeElt = { "bief", "ecluse" }; + String[] listeElt = { "bief", "\xE9cluse" }; JComboBox ListetypeElem1_ = new JComboBox(listeElt); JComboBox ListeElement_ = new JComboBox(); - String[] listeSens = { "avalant", "montant"}; + String[] listeSens = { "avalant", "montant", "tous"}; JComboBox sens_ = new JComboBox(listeSens); JComboBox ListeNavires_ = new JComboBox(); - String[] listeaction = {"Attente s\xE9curit\xE9", "Attente acc\xE8s", "Attente occupation","Attente Indisponibilit\xE9","Attente totale" }; + String[] listeaction = {"Attente de s\xE9curit\xE9", "Attente d'acc\xE8s", "Attente d'occupation","Attente d'indisponibilit\xE9", "Attente totale" }; /** * liste des actions a realiser */ @@ -174,13 +174,13 @@ */ private final BuButton exportationExcel_ = new BuButton(FudaaResource.FUDAA.getIcon("crystal_generer"), "Excel"); - final BuButton exportationgraphe_ = new BuButton(FudaaResource.FUDAA.getIcon("crystal_generer"), "exportation image"); + final BuButton exportationgraphe_ = new BuButton(FudaaResource.FUDAA.getIcon("crystal_generer"), "Exporter"); - final BuButton exportationHisto_ = new BuButton(FudaaResource.FUDAA.getIcon("crystal_generer"), "exportation image"); - private final BuButton quitter_ = new BuButton(FudaaResource.FUDAA.getIcon("crystal_quitter"), "quitter"); - private final BuButton quitter2_ = new BuButton(FudaaResource.FUDAA.getIcon("crystal_quitter"), "quitter"); - private final BuButton quitter3_ = new BuButton(FudaaResource.FUDAA.getIcon("crystal_quitter"), "quitter"); - private final BuButton validation_ = new BuButton(FudaaResource.FUDAA.getIcon("crystal_oui"), "rechercher"); + final BuButton exportationHisto_ = new BuButton(FudaaResource.FUDAA.getIcon("crystal_generer"), "Exporter"); + private final BuButton quitter_ = new BuButton(FudaaResource.FUDAA.getIcon("crystal_quitter"), "Quitter"); + private final BuButton quitter2_ = new BuButton(FudaaResource.FUDAA.getIcon("crystal_quitter"), "Quitter"); + private final BuButton quitter3_ = new BuButton(FudaaResource.FUDAA.getIcon("crystal_quitter"), "Quitter"); + private final BuButton validation_ = new BuButton(FudaaResource.FUDAA.getIcon("crystal_oui"), "Rechercher"); Border raisedBevel_ = BorderFactory.createRaisedBevelBorder(); Border loweredBevel_ = BorderFactory.createLoweredBevelBorder(); @@ -306,22 +306,22 @@ this.controlPanel_.setLayout(new GridLayout(2,1)); BuPanel panel1=new BuPanel(new FlowLayout(FlowLayout.LEFT)); BuPanel panel2=new BuPanel(new FlowLayout(FlowLayout.LEFT)); - panel1.add(new JLabel("Element:")); + panel1.add(new JLabel("Attentes \xE0 cumuler pour l'\xE9l\xE9ment")); panel1.add(this.ListetypeElem1_); panel1.add(this.ListeElement_); - panel1.add(new JLabel("Sens:")); + panel1.add(new JLabel(" dans le sens")); panel1.add(this.sens_); - panel2.add(new JLabel("categorie:")); + panel2.add(new JLabel("Cat\xE9gorie de bateaux:")); panel2.add(this.ListeNavires_); - panel2.add(new JLabel("Comparaison sur:")); + panel2.add(new JLabel(" Type d'attente:")); panel2.add(this.ListeActions_); panel2.add(validation_); this.controlPanel_.add(panel1); this.controlPanel_.add(panel2); final TitledBorder bordurea = BorderFactory.createTitledBorder(BorderFactory - .createEtchedBorder(EtchedBorder.LOWERED), "panneau de contr\xF4le"); + .createEtchedBorder(EtchedBorder.LOWERED), "D\xE9finition de la recherche"); this.controlPanel_.setBorder(bordurea); this.getContentPane().add(this.controlPanel_, BorderLayout.NORTH); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <had...@us...> - 2008-09-15 16:58:25
|
Revision: 3926 http://fudaa.svn.sourceforge.net/fudaa/?rev=3926&view=rev Author: hadouxad Date: 2008-09-15 16:57:44 +0000 (Mon, 15 Sep 2008) Log Message: ----------- - Creation des action bloque/debloque avec undo/redo - action au niveau de la widget menu popup - une seule action: action change lors du clic - gestion ds cas bordure ou non - TreeModel: ajout du listener en cas de changement de selection de widget - raffraichis l arbre (masquage + bloquage) - Finalisation de la fonction fusion de graphes - Debut fonction de fusion de calques - Les actions specifiques a tr (fusion de calque, fusion de graphe sont remplies dans la surcharge de attachNode de TrpostSCENE) - Fusion de calques: fonctionne - Les calques se superposent - menu arbre different a droite - ajout d une liste des calques: en cliquant, cela met a jour la superposition - gestion de tous les cas: - fusion de 2 calques widget - fusion widget avec une fusion et reciproquement - fusion de 2 fusions - ppossibilit?\195?\169s d editer Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/ebli_en.fr_txt branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/CommandUndoRedoBloque.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBloqueOuDebloqueWidget.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetControllerGraphe.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliJXTreeTableCellRenderer.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeTableModel.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetTreeTableNode.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/tr_en.fr_txt branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionAddPointFromWidgetCalque.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionFusionGraphes.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeModel.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java Added Paths: ----------- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/textures/Thumbs.db branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerFusionCalque.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorFusionCalques.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetFusionCalques.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/GrapheCellRenderer.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionFusionCalques.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostScene.java Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/ebli_en.fr_txt =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/ebli_en.fr_txt 2008-09-15 13:34:59 UTC (rev 3925) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/ebli_en.fr_txt 2008-09-15 16:57:44 UTC (rev 3926) @@ -608,4 +608,12 @@ Editeur de texte=text editor Double-cliquez pour \xE9diter=double click in order to edit D\xE9grouper=Degroup -Grouper=Group \ No newline at end of file +Grouper=Group +Bloquer la frame= Lock the frame +Debloquer la frame= Unlock the frame +Supprimer la frame= delete the frame +Informations= Infos +Configuration graphique= Graphical configuration +Masquer la frame= Hide the frame +Dupliquer la frame= Duplicate the frame +R\xE9aliser la fusion= Perform the merging \ No newline at end of file Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/textures/Thumbs.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java 2008-09-15 13:34:59 UTC (rev 3925) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -27,6 +27,15 @@ return getIntern().getController(); } + + EbliWidgetControllerActionOnly controllerBordure_ = null; + public EbliWidgetController getBordureController() { + return controllerBordure_; + } + + + + /** * constructeur qui gere un controller uniquement pour les actions. * @@ -52,8 +61,13 @@ // -- ajout du child --// addChild(intern_); + + // -- mise a jour des evenements (action,menus) du intern --// + // intern_.getController().majActionsBordureSpecific(this); + // --ajout du controller specifique au bordure --// - this.setController(new EbliWidgetControllerActionOnly(this, canMove, canResize)); + controllerBordure_ = new EbliWidgetControllerActionOnly(this, canMove, canResize); + this.setController(controllerBordure_); } public Insets createInset(int epaisseur) { Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java 2008-09-15 13:34:59 UTC (rev 3925) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -5,6 +5,7 @@ import java.awt.event.ActionListener; import java.util.ArrayList; +import javax.swing.AbstractButton; import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JLabel; @@ -15,11 +16,15 @@ import org.fudaa.ctulu.CtuluCommandContainer; import org.fudaa.ctulu.CtuluResource; import org.fudaa.ebli.commun.EbliActionSimple; +import org.fudaa.ebli.commun.EbliComponentFactory; import org.fudaa.ebli.controle.BConfigurableComposite; import org.fudaa.ebli.controle.BConfigurePalette; +import org.fudaa.ebli.ressource.EbliResource; import org.fudaa.ebli.visuallibrary.actions.CommandMasquer; import org.fudaa.ebli.visuallibrary.actions.CommandSupprimer; import org.fudaa.ebli.visuallibrary.actions.CommandeDuplicate; +import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionBloqueOuDebloqueWidget; +import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionSimple; import org.fudaa.ebli.visuallibrary.actions.WidgetConfigure; import org.netbeans.api.visual.action.ActionFactory; import org.netbeans.api.visual.action.PopupMenuProvider; @@ -81,7 +86,7 @@ } protected void constructMenuDupliquer(JPopupMenu _popup, final CtuluCommandContainer cmd_) { - JMenuItem menuItem1 = _popup.add("Dupliquer l'objet"); + JMenuItem menuItem1 = _popup.add(EbliResource.EBLI.getString("Dupliquer la frame")); menuItem1.setIcon(CtuluResource.CTULU.getIcon("crystal_cascade")); menuItem1.addActionListener(new ActionListener() { @@ -120,7 +125,7 @@ } protected void constructMenuMasquer(JPopupMenu _popup, final CtuluCommandContainer cmd_) { - JMenuItem menuItem = _popup.add("Masquer l'objet"); + JMenuItem menuItem = _popup.add(EbliResource.EBLI.getString("Masquer la frame")); menuItem.setIcon(CtuluResource.CTULU.getIcon("crystal_visibilite")); menuItem.addActionListener(new ActionListener() { @@ -141,9 +146,57 @@ }); } + + + public AbstractButton boutonBloque = null; + public boolean isBlocked = false; + + public void constructMenuBloquer(JPopupMenu _popup, final CtuluCommandContainer cmd_) { + // EbliWidget widgetListenMove = null; + // if (widget_.getParentWidget() != null && widget_.getParentWidget() + // instanceof EbliWidgetBordureSingle) { + // + // widgetListenMove = (EbliWidget) widget_.getParentWidget(); + // } else + // widgetListenMove = widget_; + + // FuLog.warning("widgetListenMove instanceof " + widgetListenMove); + EbliWidgetActionSimple actionBloque = new EbliWidgetActionBloqueOuDebloqueWidget.Bloque(widget_); + + boutonBloque = actionBloque.buildMenuItem(EbliComponentFactory.INSTANCE); + + _popup.add(boutonBloque); + } + + public void excecuteBlockOrDeblock() { + if (boutonBloque == null) { + EbliWidgetActionSimple actionBloque = new EbliWidgetActionBloqueOuDebloqueWidget.Bloque(widget_); + boutonBloque = actionBloque.buildMenuItem(EbliComponentFactory.INSTANCE); + } + + boutonBloque.doClick(); + } + + /** + * Methode a appeler apres coup pour mettre a jour les actions, menus et autre + * dans le cas d une bordure englobante de la widget. + * + * @param bordure + */ + public void majActionsBordureSpecific(EbliWidgetBordureSingle bordure) { + + // -- mise a jour action block/deblock --// + EbliWidgetActionSimple actionBloque = new EbliWidgetActionBloqueOuDebloqueWidget.Bloque(bordure); + if (boutonBloque != null) + boutonBloque.setAction(actionBloque); + + } + + + protected void constructMenuSupprimer(JPopupMenu _popup, final CtuluCommandContainer cmd_) { - JMenuItem menuItem = _popup.add("Supprimer l'objet"); + JMenuItem menuItem = _popup.add(EbliResource.EBLI.getString("Supprimer la frame")); menuItem.setIcon(CtuluResource.CTULU.getIcon("crystal_non")); menuItem.addActionListener(new ActionListener() { @@ -179,13 +232,14 @@ // -- reference vers le gestionnaire de commandeundo/redo --// final CtuluCommandContainer cmd_ = getWidget().getEbliScene().getCmdMng(); - JMenuItem menuItem3 = _popup.add("Informations"); + JMenuItem menuItem3 = _popup.add(EbliResource.EBLI.getString("Informations")); menuItem3.setIcon(BuResource.BU.getIcon("crystal_aide")); menuItem3.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - JOptionPane.showMessageDialog(null, getDescription(), "Informations", JOptionPane.DEFAULT_OPTION, null); + JOptionPane.showMessageDialog(null, getDescription(), EbliResource.EBLI.getString("Informations"), + JOptionPane.DEFAULT_OPTION, null); } }); @@ -196,7 +250,12 @@ constructMenuDupliquer(_popup, cmd_); } + + constructMenuBloquer(_popup, cmd_); + constructMenuSupprimer(_popup, cmd_); + + } @@ -207,7 +266,7 @@ */ public void constructPopupMenuBaseGraphique(JPopupMenu _popup) { - JMenuItem menuItem4 = _popup.add("Configuration graphique"); + JMenuItem menuItem4 = _popup.add(EbliResource.EBLI.getString("Configuration graphique")); menuItem4.setIcon(CtuluResource.CTULU.getIcon("crystal_configurer")); // BuResource.BU.getIcon("configurer") menuItem4.addActionListener(new ActionListener() { @@ -227,7 +286,7 @@ palette.setTargetConf(cmp); JDialog d = new JDialog(); d.setModal(true); - d.setTitle("Configuration graphique"); + d.setTitle(EbliResource.EBLI.getString("Configuration graphique")); d.setContentPane(palette); d.pack(); Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/CommandUndoRedoBloque.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/CommandUndoRedoBloque.java 2008-09-15 13:34:59 UTC (rev 3925) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/CommandUndoRedoBloque.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -1,10 +1,7 @@ package org.fudaa.ebli.visuallibrary.actions; -import java.util.ArrayList; -import java.util.Iterator; - import org.fudaa.ctulu.CtuluCommand; -import org.fudaa.ebli.visuallibrary.EbliWidget; +import org.fudaa.ebli.visuallibrary.EbliWidgetController; /** * Commande undo/redo sur le blocage des widgets. @@ -14,10 +11,10 @@ public class CommandUndoRedoBloque implements CtuluCommand { - ArrayList<EbliWidget> widget_; + EbliWidgetController widget_; boolean bloque_ = true; - public CommandUndoRedoBloque(ArrayList<EbliWidget> widget, boolean bloque) { + public CommandUndoRedoBloque(EbliWidgetController widget, boolean bloque) { super(); this.widget_ = widget; bloque_ = bloque; @@ -25,20 +22,45 @@ public void undo() { - for (Iterator<EbliWidget> it = widget_.iterator(); it.hasNext();) { - if (bloque_) it.next().getController().replaceActionResizeAndMove(); - else it.next().getController().removeActionResizeAndMove(); + + if (bloque_) { + widget_.replaceActionResizeAndMove(); + // -- on change l action du bouton du controller --// + widget_.getWidget().getController().boutonBloque.setAction(new EbliWidgetActionBloqueOuDebloqueWidget.Bloque( + widget_.getWidget())); + widget_.getWidget().getController().isBlocked = true; } + else { + widget_.removeActionResizeAndMove(); + // -- on change l action du bouton du controller --// + widget_.getWidget().getController().boutonBloque.setAction(new EbliWidgetActionBloqueOuDebloqueWidget.DeBloque( + widget_.getWidget())); + widget_.getWidget().getController().isBlocked = false; + } + - widget_.get(0).getEbliScene().refresh(); + widget_.getWidget().getEbliScene().refresh(); } public void redo() { - for (Iterator<EbliWidget> it = widget_.iterator(); it.hasNext();) { - if (bloque_) it.next().getController().removeActionResizeAndMove(); - else it.next().getController().replaceActionResizeAndMove(); + + if (bloque_) { + widget_.removeActionResizeAndMove(); + // -- on change l action du bouton du controller --// + widget_.getWidget().getController().boutonBloque.setAction(new EbliWidgetActionBloqueOuDebloqueWidget.DeBloque( + widget_.getWidget())); + widget_.getWidget().getController().isBlocked = true; } - widget_.get(0).getEbliScene().refresh(); + + else { + widget_.replaceActionResizeAndMove(); + // -- on change l action du bouton du controller --// + widget_.getWidget().getController().boutonBloque.setAction(new EbliWidgetActionBloqueOuDebloqueWidget.Bloque( + widget_.getWidget())); + widget_.getWidget().getController().isBlocked = false; + } + + widget_.getWidget().getEbliScene().refresh(); } } \ No newline at end of file Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBloqueOuDebloqueWidget.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBloqueOuDebloqueWidget.java 2008-09-15 13:34:59 UTC (rev 3925) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetActionBloqueOuDebloqueWidget.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -1,19 +1,18 @@ package org.fudaa.ebli.visuallibrary.actions; import java.awt.event.ActionEvent; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Set; import javax.swing.Icon; import org.fudaa.ctulu.CtuluCommandContainer; import org.fudaa.ctulu.CtuluResource; import org.fudaa.ebli.ressource.EbliResource; -import org.fudaa.ebli.visuallibrary.EbliNode; -import org.fudaa.ebli.visuallibrary.EbliScene; import org.fudaa.ebli.visuallibrary.EbliWidget; +import org.fudaa.ebli.visuallibrary.EbliWidgetBordureSingle; +import org.fudaa.ebli.visuallibrary.EbliWidgetController; +import com.memoire.fu.FuLog; + /** * Action qui empeche les widgets de se resize et d'etre deplacee * @@ -25,64 +24,75 @@ final CtuluCommandContainer cmd_; boolean bloque_ = true; + EbliWidget widget_; + + public EbliWidgetActionBloqueOuDebloqueWidget(String name, Icon ic, String id, EbliWidget _widget, boolean bloque) { + super(_widget.getEbliScene(), name, ic, id); - public EbliWidgetActionBloqueOuDebloqueWidget(String name, Icon ic, String id, EbliScene _scene, boolean bloque) { - super(_scene, name, ic, id); - - - cmd_ = _scene.getCmdMng(); + widget_ = _widget; + cmd_ = _widget.getEbliScene().getCmdMng(); bloque_ = bloque; } public static class Bloque extends EbliWidgetActionBloqueOuDebloqueWidget { - public Bloque(EbliScene _scene) { - super(EbliResource.EBLI.getString("Bloquer les objets s\xE9lectionn\xE9s "), CtuluResource.CTULU - .getIcon("crystal_tuer"), "BLOQUEWIDGET", _scene, true); + public Bloque(EbliWidget _widget) { + super(EbliResource.EBLI.getString("Bloquer la frame"), CtuluResource.CTULU + .getIcon("crystal_tuer"), "BLOQUEWIDGET", _widget, true); } } public static class DeBloque extends EbliWidgetActionBloqueOuDebloqueWidget { - public DeBloque(EbliScene _scene) { - super(EbliResource.EBLI.getString("Debloquer les objets s\xE9lectionn\xE9s "), CtuluResource.CTULU - .getIcon("crystal_valider"), "DEBLOQUEWIDGET", _scene, false); + public DeBloque(EbliWidget _widget) { + super(EbliResource.EBLI.getString("Debloquer la frame"), CtuluResource.CTULU + .getIcon("crystal_valider"), "DEBLOQUEWIDGET", _widget, false); } } public void actionPerformed(ActionEvent e) { - // -- recuperation de la liste des nodes de la scene --// - Set<EbliNode> listeNode = (Set<EbliNode>) scene_.getSelectedObjects(); + EbliWidgetController controller = null; + + + if (widget_ instanceof EbliWidgetBordureSingle) { - // -- liste des widget selectionnees --// - ArrayList<EbliWidget> listeWidget = new ArrayList<EbliWidget>(); - - // -- parcours des nodes - for (Iterator<EbliNode> it = listeNode.iterator(); it.hasNext();) { - - EbliNode currentNode = it.next(); - if (currentNode != null && currentNode.hasWidget()) { - - // -- bloquage de la widget --// - if (bloque_) - currentNode.getWidget().getController().removeActionResizeAndMove(); - else - currentNode.getWidget().getController().replaceActionResizeAndMove(); - listeWidget.add(currentNode.getWidget()); - + controller = ((EbliWidgetBordureSingle) widget_).getBordureController(); + } else + if (widget_.getParentWidget() instanceof EbliWidgetBordureSingle) { + controller = ((EbliWidgetBordureSingle) widget_.getParentWidget()).getBordureController(); + } else + controller = widget_.getController(); + + FuLog.warning("controller instanceof " + controller); + + if (bloque_) { + controller.removeActionResizeAndMove(); + + // -- on change l action du bouton du controller --// + // -- ACHTUNG!! il faut toujours utilsier el controller de la widget car + // le controlelr de la bordure ne contient pas de menus + widget_.getController().boutonBloque.setAction(new EbliWidgetActionBloqueOuDebloqueWidget.DeBloque(widget_)); + widget_.getController().isBlocked = true; + + } else { + controller.replaceActionResizeAndMove(); + // -- on change l action du bouton du controller --// + widget_.getController().boutonBloque.setAction(new EbliWidgetActionBloqueOuDebloqueWidget.Bloque(widget_)); + widget_.getController().isBlocked = false; + } // -- rafraichissement de la scene --// scene_.refresh(); - } + - } + // -- enregistrement de la commande undoRedo --// if (cmd_ != null) { - cmd_.addCmd(new CommandUndoRedoBloque(listeWidget, bloque_)); + cmd_.addCmd(new CommandUndoRedoBloque(controller, bloque_)); } } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java 2008-09-15 13:34:59 UTC (rev 3925) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -32,10 +32,7 @@ import org.fudaa.ebli.visuallibrary.EbliWidgetWithBordure; import org.fudaa.ebli.visuallibrary.actions.CommandMasquer; import org.fudaa.ebli.visuallibrary.actions.EbliActionEditorOneClick; -import org.netbeans.api.visual.action.ActionFactory; -import org.netbeans.api.visual.action.PopupMenuProvider; import org.netbeans.api.visual.action.WidgetAction; -import org.netbeans.api.visual.widget.Widget; import com.memoire.bu.BuMenuBar; import com.memoire.bu.BuPanel; @@ -51,6 +48,8 @@ JLabel labelTrace_; + public boolean hasAlreadyFusion = false; + /** * widget de la legende */ Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerFusionCalque.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerFusionCalque.java (rev 0) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerFusionCalque.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -0,0 +1,269 @@ +package org.fudaa.ebli.visuallibrary.calque; + +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.image.BufferedImage; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.swing.BorderFactory; +import javax.swing.DefaultListModel; +import javax.swing.Icon; +import javax.swing.ImageIcon; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JMenu; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.JScrollPane; +import javax.swing.ListSelectionModel; + +import org.fudaa.ctulu.image.CtuluLibImage; +import org.fudaa.ebli.calque.BArbreCalque; +import org.fudaa.ebli.calque.BCalquePaletteInfo; +import org.fudaa.ebli.calque.ZEbliCalquesPanel; +import org.fudaa.ebli.calque.action.EbliCalqueActionTimeChooser; +import org.fudaa.ebli.commun.EbliActionInterface; +import org.fudaa.ebli.commun.EbliComponentFactory; +import org.fudaa.ebli.commun.EbliLib; +import org.fudaa.ebli.controle.BSelecteurListComboBox; +import org.fudaa.ebli.ressource.EbliResource; +import org.fudaa.ebli.visuallibrary.EbliWidgetControllerMenuOnly; +import org.fudaa.ebli.visuallibrary.EbliWidgetWithBordure; +import org.fudaa.ebli.visuallibrary.graphe.GrapheCellRenderer; + +import com.memoire.bu.BuMenuBar; +import com.memoire.bu.BuToolBar; + +public class EbliWidgetControllerFusionCalque extends EbliWidgetControllerMenuOnly { + + JLabel labelTrace_; + + /** + * widget de la legende + */ + CalqueLegendeWidgetAdapter legendeWidget_; + + BuMenuBar menuCalque_; + + JPanel panelTreeCalque_; + + BuToolBar toolbarCalque_; + + JList selectionCalque_; + + BArbreCalque arbreCalque_; + + EbliWidgetFusionCalques widgetCalque_; + EbliWidgetWithBordure widgetParent_; + + + + public boolean hasAlreadyFusion = false; + + + public EbliWidgetControllerFusionCalque(EbliWidgetFusionCalques _widget, EbliWidgetWithBordure _parent) { + super(_parent); + widgetCalque_ = _widget; + widgetParent_ = _parent; + addActionSpecifiques(); + + } + + public void addActionSpecifiques() { + + // WidgetAction editorAction = new EbliActionEditorOneClick<BuPanel>( + // (EbliWidgetVueCalque) widgetCalque_.widgetCalque1_); + // // -- ajout de l action au widget correspondant --// + // widgetCalque_.getActions().addAction(editorAction); + + } + + + + +public ZEbliCalquesPanel getCalqueCourant() { + return widgetCalque_.getCalqueCourant().calquePanel_; + } + + + /** + * retourne le menuBar associee au calque + * + * @return + */ + public BuMenuBar getMenubarComponent() { + + if (menuCalque_ == null) { + + menuCalque_ = new BuMenuBar(); + + } + menuCalque_.removeAll(); + + JMenu[] specificMenus = getCalqueCourant().getSpecificMenus(EbliLib.getS("Vue 2D")); + + for (int i = 0; i < specificMenus.length; i++) { + menuCalque_.add(specificMenus[i]); + } + + + return menuCalque_; + + } + + /** + * remplit le model de la liste par des labels representants le contenu du + * widgt fusion. + * + * @return + */ +public DefaultListModel fillModelListWithCalques() { + Map params = new HashMap(); + CtuluLibImage.setCompatibleImageAsked(params); + DefaultListModel model = new DefaultListModel(); + for (int i = 0; i < widgetCalque_.listeWidgetCalque_.size(); i++) { + + JLabel label = new JLabel(); + label.setText("" + widgetCalque_.getWidgetCalque(i).calquePanel_.getCqInfos().getTitle()); + BufferedImage image = widgetCalque_.getWidgetCalque(i).calquePanel_.produceImage(70, 30, params); + Icon icone = new ImageIcon(image); + label.setIcon(icone); + model.addElement(label); + + } + + selectionCalque_.addListSelectionListener(widgetCalque_); + // model.addListDataListener(widgetCalque_); + + return model; + } + + /** + * Recupere les objets graphique tree et panel infos associe au calque. + * + * @return + */ + public JComponent getOverviewComponent() { + + // -- jlist qui propose la liste des composants du calque --// + if (selectionCalque_ == null) { + selectionCalque_ = new JList(); + selectionCalque_.setCellRenderer(new GrapheCellRenderer()); + selectionCalque_.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Liste des calques"))); + selectionCalque_.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + selectionCalque_.setSize(250, 100); + selectionCalque_.setPreferredSize(new Dimension(250, 100)); + selectionCalque_.setMaximumSize(new Dimension(250, 100)); + + + } + // -- creation du model de la jlist --// + DefaultListModel model = fillModelListWithCalques(); + selectionCalque_.setModel(model); + // selectionCalque_.setSelectedIndex(widgetCalque_.getIndexCalqueCourant()); + + + + if (panelTreeCalque_ == null) { + panelTreeCalque_ = new JPanel(new BorderLayout()); + + + BCalquePaletteInfo info = new BCalquePaletteInfo(getCalqueCourant().getArbreCalqueModel()); + info.setAvailable(true); + panelTreeCalque_.add(info, BorderLayout.NORTH); + JPanel panelConteneur = new JPanel(new BorderLayout()); + + arbreCalque_ = new BArbreCalque(); + arbreCalque_.setBorder(BorderFactory.createTitledBorder(EbliResource.EBLI.getString("Arbre du calque"))); + panelConteneur.add(arbreCalque_, BorderLayout.CENTER); + panelConteneur.add(new JScrollPane(selectionCalque_), BorderLayout.NORTH); + + panelTreeCalque_.add(new JScrollPane(panelConteneur), BorderLayout.CENTER); + + } + // -- mise a jour du model de l arbre --// + arbreCalque_.setModel(getCalqueCourant().getArbreCalqueModel()); + + + return panelTreeCalque_; + } + + /** + * Obtient la toolbar specifique au calque + * + * @return + */ + public BuToolBar getToolbarComponent() { + + if (toolbarCalque_ == null) { + toolbarCalque_ = new BuToolBar(); + } + toolbarCalque_.removeAll(); + + // ajout des tool specifiques du calque + List actions = getCalqueCourant().getController().getActions(); + for (Iterator iterator = actions.iterator(); iterator.hasNext();) { + EbliActionInterface object = (EbliActionInterface) iterator.next(); + if (object == null) { + toolbarCalque_.addSeparator(); + } else { + toolbarCalque_.add(object.buildToolButton(EbliComponentFactory.INSTANCE)); + } + } + + // -- ajout des comboBox des variables --// + BSelecteurListComboBox combo = new BSelecteurListComboBox(); + // pour mettre \xE0 jour la combo d\xE8s que la s\xE9lection de l'arbre change + getCalqueCourant().getArbreCalqueModel().getTreeSelectionModel().addTreeSelectionListener(combo); + combo.setPalettePanelTarget(getCalqueCourant().getArbreCalqueModel().getSelectedCalque()); + // combo.setPalettePanelTarget(listselector.getTarget()); + combo.setMinimumSize(combo.getPreferredSize()); + combo.setMaximumSize(combo.getPreferredSize()); + + // ajout combobox + toolbarCalque_.add(combo); + + // -- ajout des combo des pas de temps --// + EbliCalqueActionTimeChooser chooserT = new EbliCalqueActionTimeChooser(getCalqueCourant().getArbreCalqueModel() + .getTreeSelectionModel(), true); + // pour activer l'action + chooserT.setSelected(true); + combo = (BSelecteurListComboBox) chooserT.buildContentPane(); + chooserT.updateBeforeShow(); + combo.setMaximumSize(combo.getPreferredSize()); + combo.setMinimumSize(combo.getPreferredSize()); + + // ajout combobox + toolbarCalque_.add(combo); + + + return toolbarCalque_; + } + + /** + * affiche le label des coordonnees + */ + public JComponent geTtracableComponent() { + + + return getCalqueCourant().getLabelSuiviSouris(); + } + + + + @Override + protected void buildPopupMenu(JPopupMenu _menu) { + // constructPopupMenuSpecifique(_menu); + // -- creation du menu commun a tous les widgets + constructPopupMenuBase(_menu); + } + + + + + +} Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorFusionCalques.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorFusionCalques.java (rev 0) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorFusionCalques.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -0,0 +1,73 @@ +package org.fudaa.ebli.visuallibrary.calque; + +import java.awt.Dimension; +import java.util.ArrayList; +import java.util.Iterator; + +import org.fudaa.ebli.geometrie.GrBoite; +import org.fudaa.ebli.visuallibrary.EbliNode; +import org.fudaa.ebli.visuallibrary.EbliScene; +import org.fudaa.ebli.visuallibrary.EbliWidget; +import org.fudaa.ebli.visuallibrary.EbliWidgetBordureSingle; +import org.fudaa.ebli.visuallibrary.EbliWidgetCreator; +import org.fudaa.ebli.visuallibrary.EbliWidgetWithBordure; + +public class EbliWidgetCreatorFusionCalques implements EbliWidgetCreator { + + ArrayList<EbliWidgetVueCalque> listeWidgetCalque_; + + GrBoite initZoom_; + + EbliWidgetWithBordure res; + + + + public EbliWidgetCreatorFusionCalques(EbliWidgetVueCalque widgetCalque1_, + ArrayList<EbliWidgetVueCalque> listWidgetToMerge) { + this(widgetCalque1_, listWidgetToMerge, null); + } + + public EbliWidgetCreatorFusionCalques(EbliWidgetVueCalque widgetCalque1_, + ArrayList<EbliWidgetVueCalque> listWidgetToMerge, + GrBoite _initZoom) { + super(); + listeWidgetCalque_ = new ArrayList<EbliWidgetVueCalque>(); + + listeWidgetCalque_.add(widgetCalque1_); + + for (Iterator<EbliWidgetVueCalque> it = listWidgetToMerge.iterator(); it.hasNext();) + listeWidgetCalque_.add(it.next()); + + initZoom_ = _initZoom; + // legendeDuplic_= + } + + + public EbliWidget create(EbliScene _scene) { + EbliWidgetFusionCalques widgetCalque = new EbliWidgetFusionCalques(_scene, listeWidgetCalque_, + initZoom_); + res = new EbliWidgetBordureSingle(widgetCalque); + res.setPreferredSize(new Dimension(400, 400)); + widgetCalque.setController(new EbliWidgetControllerFusionCalque(widgetCalque, res)); + return res; + } + + + + public EbliWidgetWithBordure getBordure() { + return res; + } + + + + public EbliWidget getWidget() { + return res; + } + + public EbliNode duplicate(EbliNode _nodeAdupliquer) { + return null; + } + + + +} Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetFusionCalques.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetFusionCalques.java (rev 0) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetFusionCalques.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -0,0 +1,133 @@ +package org.fudaa.ebli.visuallibrary.calque; + +import java.awt.Dimension; +import java.util.ArrayList; +import java.util.Iterator; + +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; + +import org.fudaa.ebli.calque.ZEbliCalquesPanel; +import org.fudaa.ebli.geometrie.GrBoite; +import org.fudaa.ebli.visuallibrary.EbliScene; +import org.fudaa.ebli.visuallibrary.EbliWidget; +import org.netbeans.modules.visual.layout.OverlayLayout; + +/** + * Widget qui resulte de la fusion de 2 calques. + * + * @author Adrien Hadoux + * + */ +public class EbliWidgetFusionCalques extends EbliWidget implements ListSelectionListener { + + ArrayList<EbliWidgetVueCalque> listeWidgetCalque_; + + /** + * Calque courant qui sera modifi\xE9 a chaque fois que l utilisateur changera de + * calque de premier plan. + */ + EbliWidgetVueCalque calqueCourant_; + + OverlayLayout layout_; + + GrBoite initZoom_; + + + public EbliWidgetFusionCalques(EbliScene _scene, ArrayList<EbliWidgetVueCalque> _liste, GrBoite zoom) { + super(_scene); + + initZoom_ = zoom; + listeWidgetCalque_=_liste; + // --creation du layout de mise en page --// + layout_ = new OverlayLayout(); + this.setLayout(layout_); + + // -- ajout des widgets --// + for (Iterator<EbliWidgetVueCalque> it = listeWidgetCalque_.iterator(); it.hasNext();) { + EbliWidgetVueCalque calque = it.next(); + this.addChild(calque); + // -- mise a jour du zoom + calque.initZoom_ = initZoom_; + + // init le calque courant + if (calqueCourant_ == null) + calqueCourant_ = calque; + } + setPreferredSize(new Dimension(500, 400)); + + } + + /** + * Methode utilisee pour mettre au premier plan la widget selectionnee. + * + * @param newCrt + * : nouvelle widget calque a positionner au premier plan + */ + public void changeWidgetCourant(EbliWidgetVueCalque newCrt) { + calqueCourant_ = newCrt; + + // -- mise au premier plan de newCrt --// + bringToFront(calqueCourant_); + + + + } + + + public void bringToFront(EbliWidgetVueCalque widget) { + + this.removeChild(widget); + + // -- ajout pour qu elle soit en premier plan --// + this.addChild(widget); + + // -- refrresh de la scene --// + getEbliScene().refresh(); + } + + public EbliWidgetVueCalque getCalqueCourant() { + return calqueCourant_; + } + + + public ZEbliCalquesPanel getCalque(int i) { + + return getWidgetCalque(i).calquePanel_; + } + + public int getNbWidgets() { + return listeWidgetCalque_.size(); + } + + public EbliWidgetVueCalque getWidgetCalque(int i) { + return listeWidgetCalque_.get(i); + } + + + public int getIndexCalqueCourant() { + + for (int i = 0; i < listeWidgetCalque_.size(); i++) + if (listeWidgetCalque_.get(i) == calqueCourant_) + return i; + + return -1; + } + + public void valueChanged(ListSelectionEvent _e) { + + // -- on est dans un cas single selection mode --// + int selected = _e.getFirstIndex(); + + // -- on change de calque courant --// + if (selected < listeWidgetCalque_.size()) + changeWidgetCourant(getWidgetCalque(selected)); + + } + + + + + + +} Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2008-09-15 13:34:59 UTC (rev 3925) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -1,22 +1,16 @@ package org.fudaa.ebli.visuallibrary.calque; -import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.awt.Rectangle; import java.awt.Window; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.awt.image.BufferedImage; import java.util.EnumSet; import java.util.HashMap; import java.util.Map; import javax.swing.BorderFactory; -import javax.swing.JComponent; -import javax.swing.SwingUtilities; import org.fudaa.ctulu.image.CtuluLibImage; import org.fudaa.ebli.calque.BCalque; @@ -46,7 +40,7 @@ Window frame_; BufferedImage image; - GrBoite initZoom_; + public GrBoite initZoom_; BuPanel conteneurEditor; Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetControllerGraphe.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetControllerGraphe.java 2008-09-15 13:34:59 UTC (rev 3925) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetControllerGraphe.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -31,10 +31,7 @@ import org.fudaa.ebli.visuallibrary.EbliWidgetControllerMenuOnly; import org.fudaa.ebli.visuallibrary.actions.CommandMasquer; import org.fudaa.ebli.visuallibrary.actions.EbliActionEditorOneClick; -import org.netbeans.api.visual.action.ActionFactory; -import org.netbeans.api.visual.action.PopupMenuProvider; import org.netbeans.api.visual.action.WidgetAction; -import org.netbeans.api.visual.widget.Widget; import com.memoire.bu.BuMenuBar; import com.memoire.bu.BuPanel; @@ -52,6 +49,8 @@ public boolean alreadyCreate_ ; + public boolean hasAlreadyFusion = false; + JLabel labelTrace_; BuMenuBar menuGraphe_ ; Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/GrapheCellRenderer.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/GrapheCellRenderer.java (rev 0) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/GrapheCellRenderer.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -0,0 +1,40 @@ +package org.fudaa.ebli.visuallibrary.graphe; + +import java.awt.Color; +import java.awt.Component; + +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.ListCellRenderer; +import javax.swing.UIManager; + +/** + * Renderer de cellules pour les graphes et calques. Permet d avoir des + * miniatures des widgets. + * + * @author Adrien Hadoux + * + */ +public class GrapheCellRenderer extends JLabel implements ListCellRenderer { + private final Color HIGHLIGHT_COLOR = UIManager.getColor("Tree.selectionBackground"); + + public GrapheCellRenderer() { + setOpaque(true); + setIconTextGap(12); + } + + public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, + boolean cellHasFocus) { + JLabel entry = (JLabel) value; + setText(entry.getText()); + setIcon(entry.getIcon()); + if (isSelected) { + setBackground(HIGHLIGHT_COLOR); + setForeground(Color.white); + } else { + setBackground(Color.white); + setForeground(Color.black); + } + return this; + } +} \ No newline at end of file Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliJXTreeTableCellRenderer.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliJXTreeTableCellRenderer.java 2008-09-15 13:34:59 UTC (rev 3925) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliJXTreeTableCellRenderer.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -30,8 +30,9 @@ public Icon iconLeafDisabled=CtuluResource.CTULU.getIcon("crystal_cacher"); public Icon iconSubDirectorie=CtuluResource.CTULU.getIcon("reouvrir"); public Icon iconRoot=CtuluResource.CTULU.getIcon("crystal_maison"); + public Icon iconBloque = CtuluResource.CTULU.getIcon("crystal_tuer"); + public Icon iconDeBloque = CtuluResource.CTULU.getIcon("crystal_valider"); - public EbliJXTreeTableCellRenderer() { returnLabel.setOpaque(false); returnLabel.setHorizontalAlignment(BuLabel.LEFT); Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeTableModel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeTableModel.java 2008-09-15 13:34:59 UTC (rev 3925) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetJXTreeTableModel.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -31,7 +31,7 @@ /** * titres des colonnes. */ - private static final String[] title = { "", EbliLib.getS("Nom"), "V" }; + private static final String[] title = { "", EbliLib.getS("Nom"), "V", EbliLib.getS("Bloqu\xE9") }; final EbliScene scene_; final ObjectSceneListener sceneListener_; @@ -51,6 +51,45 @@ nodeAdded((EbliNode) _addedObject); } + // @Override + // public void selectionChanged(ObjectSceneEvent _event, Set<Object> + // _previousSelection, Set<Object> _newSelection) { + // + // // -- mettre a jour l arbre --// + // EbliWidgetJXTreeTableModel.this.modelSupport.fireTreeStructureChanged( + // null); + // + // } + // + // + // @Override + // public void focusChanged(ObjectSceneEvent _event, Object + // _previousFocusedObject, Object _newFocusedObject) { + // // -- mettre a jour l arbre --// + // EbliWidgetJXTreeTableModel.this.modelSupport.fireTreeStructureChanged( + // null); + // + // } + // + // @Override + // public void hoverChanged(ObjectSceneEvent _event, Object + // _previousHoveredObject, Object _newHoveredObject) { + // // -- mettre a jour l arbre --// + // EbliWidgetJXTreeTableModel.this.modelSupport.fireTreeStructureChanged( + // null); + // + // } + // + // @Override + // public void objectStateChanged(ObjectSceneEvent _event, Object + // _changedObject, ObjectState _previousState, + // ObjectState _newState) { + // // -- mettre a jour l arbre --// + // EbliWidgetJXTreeTableModel.this.modelSupport.fireTreeStructureChanged( + // null); + // + // } + @Override public void objectRemoved(ObjectSceneEvent _event, Object _removedObject) { nodeRemoved((EbliNode) _removedObject); @@ -133,6 +172,8 @@ return String.class; case 2: return Boolean.class; + case 3: + return Boolean.class; default: return null; } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetTreeTableNode.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetTreeTableNode.java 2008-09-15 13:34:59 UTC (rev 3925) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetTreeTableNode.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -56,7 +56,7 @@ } public int getColumnCount() { - return 3; + return 4; } public Object getValueAt(int _column) { @@ -68,7 +68,13 @@ if (_column == 1) { return ((EbliNodeDefault) getUserObject()).getTitle(); } + if (_column == 2) return Boolean.valueOf(((EbliNodeDefault) getUserObject()).getWidget().isVisible()); + + + return Boolean.valueOf(((EbliNodeDefault) getUserObject()).getWidget().getController().isBlocked); + + } @Override @@ -121,6 +127,10 @@ ((EbliNode) getUserObject()).getWidget().getEbliScene().refresh(); } + else if (_column == 3) { + // -- bloque debloque --// + ((EbliNode) getUserObject()).getWidget().getController().excecuteBlockOrDeblock(); + } } } Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionAddPointFromWidgetCalque.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionAddPointFromWidgetCalque.java 2008-09-15 13:34:59 UTC (rev 3925) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionAddPointFromWidgetCalque.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -1,8 +1,6 @@ package org.fudaa.fudaa.tr.post; import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Component; import java.awt.FlowLayout; import java.awt.GridLayout; import java.awt.event.ActionEvent; @@ -25,8 +23,6 @@ import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JPanel; -import javax.swing.ListCellRenderer; -import javax.swing.UIManager; import org.fudaa.ctulu.CtuluCommandContainer; import org.fudaa.ctulu.CtuluResource; @@ -40,6 +36,7 @@ import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionSimple; import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque; import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe; +import org.fudaa.ebli.visuallibrary.graphe.GrapheCellRenderer; import org.fudaa.fudaa.meshviewer.profile.MvProfileBuilderFromTree; import org.fudaa.fudaa.meshviewer.profile.MvProfileCoteTester; import org.fudaa.fudaa.meshviewer.profile.MvProfileTreeModel; @@ -327,30 +324,8 @@ public abstract boolean isCorrectGraph(EGGrapheModel _model); - public class GrapheCellRenderer extends JLabel implements ListCellRenderer { - private final Color HIGHLIGHT_COLOR = UIManager.getColor("Tree.selectionBackground"); + - public GrapheCellRenderer() { - setOpaque(true); - setIconTextGap(12); - } - - public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, - boolean cellHasFocus) { - JLabel entry = (JLabel) value; - setText(entry.getText()); - setIcon(entry.getIcon()); - if (isSelected) { - setBackground(HIGHLIGHT_COLOR); - setForeground(Color.white); - } else { - setBackground(Color.white); - setForeground(Color.black); - } - return this; - } - } - /** * construit l interface * Added: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionFusionCalques.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionFusionCalques.java (rev 0) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionFusionCalques.java 2008-09-15 16:57:44 UTC (rev 3926) @@ -0,0 +1,375 @@ +package org.fudaa.fudaa.tr.post; + +import java.awt.BorderLayout; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.image.BufferedImage; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +import javax.swing.BorderFactory; +import javax.swing.DefaultListModel; +import javax.swing.Icon; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.ListSelectionModel; + +import org.fudaa.ctulu.CtuluResource; +import org.fudaa.ctulu.ProgressionBuAdapter; +import org.fudaa.ctulu.ProgressionInterface; +import org.fudaa.ctulu.gui.CtuluTaskOperationGUI; +import org.fudaa.ctulu.image.CtuluLibImage; +import org.fudaa.ebli.calque.ZEbliCalquesPanel; +import org.fudaa.ebli.ressource.EbliResource; +import org.fudaa.ebli.visuallibrary.EbliNode; +import org.fudaa.ebli.visuallibrary.EbliNodeDefault; +import org.fudaa.ebli.visuallibrary.EbliWidgetBordureSingle; +import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionSimple; +import org.fudaa.ebli.visuallibrary.calque.EbliWidgetControllerCalque; +import org.fudaa.ebli.visuallibrary.calque.EbliWidgetControllerFusionCalque; +import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorFusionCalques; +import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque; +import org.fudaa.ebli.visuallibrary.calque.EbliWidgetFusionCalques; +import org.fudaa.ebli.visuallibrary.calque.EbliWidgetVueCalque; +import org.fudaa.ebli.visuallibrary.graphe.GrapheCellRenderer; +import org.fudaa.fudaa.tr.common.TrResource; + +import com.memoire.bu.BuDialog; +import com.memoire.bu.BuDialogConfirmation; +import com.memoire.bu.BuScrollPane; +import com.memoire.fu.FuLog; + +/** + * Action qui realise la fusion des calques + * + * @author Adrien Hadoux + * + */ +public class TrPostActionFusionCalques extends EbliWidgetActionSimple { + + TrPostProjet projet_; + EbliWidgetVueCalque widgetCalque_; + EbliNode nodeCalque_; + JList jListeCalques_; + ArrayList<JLabel> listeObjetsCalques; + + // -- les node possibles a choisir --// + ArrayList<EbliNode> listeCalquesPossibles; + + + + + ArrayList<EbliWidgetVueCalque> listeTotaleWidgetToMerge_ = new ArrayList<EbliWidgetVueCalque>(); + + JComponent content_; + BuDialog dialog_; + DefaultListModel modelCalquesPossibles_; + + + + /** + * constructeur pour le cas de widget calque classiques. + * + * @param widget + * @param nodeGraphe + * @param projet + */ + public TrPostActionFusionCalques(EbliWidgetVueCalque widget, EbliNode nodeGraphe, TrPostProjet projet) { + super(widget.getEbliScene(), TrResource.getS("Fusion avec un autre calque"), CtuluResource.CTULU.getIcon("cible"), + "ADDPOINTWIDGET"); + + + widgetCalque_ = widget; + nodeCalque_ = nodeGraphe; + projet_ = projet; + + // -- ajout de la combo dans la toolbar de la widget --// + if (!((EbliWidgetControllerCalque) widgetCalque_.getController()).hasAlreadyFusion) { + widgetCalque_.getController().getPopup().add(this); + ((EbliWidgetControllerCalque) widgetCalque_.getController()).hasAlreadyFusion = true; + } + } + + + + /** + * Constructeur pour le cas d une widget fusion + */ + public TrPostActionFusionCalques(EbliWidgetFusionCalques widgetFusion, EbliNode nodeGraphe, TrPostProjet projet) { + super(widgetFusion.getEbliScene(), TrResource.getS("Fusion avec un autre calque"), CtuluResource.CTULU + .getIcon("cible"), + "ADDPOINTWIDGET"); + + for (int i = 1; i < widgetFusion.getNbWidgets(); i++) + listeTotaleWidgetToMerge_.add(widgetFusion.getWidgetCalque(i)); + + widgetCalque_ = widgetFusion.getWidgetCalque(0); + nodeCalque_ = nodeGraphe; + projet_ = projet; + + // -- ajout de la combo dans la toolbar de la widget --// + if (!((EbliWidgetControllerFusionCalque) widgetFusion.getController()).hasAlreadyFusion) { + widgetFusion.getController().getPopup().add(this); + ((EbliWidgetControllerFusionCalque) widgetFusion.getController()).hasAlreadyFusion = true; + } + } + + /** + * remplissage de la combo avec les graphes disponibles et compatibles + * + * @param scene + */ + private void remplirCombo() { + Map params = new HashMap(); + CtuluLibImage.setCompatibleImageAsked(params); + listeCalquesPossibles = new ArrayList<EbliNode>(); + listeObjetsCalques = new ArrayList<JLabel>(); + + // -- remplissage de la liste a partir de l ecoute de la scene--// + Set<EbliNode> listeNode = (Set<EbliNode>) scene_.getObjects(); + for (Iterator<EbliNode> it = listeNode.iterator(); it.hasNext();) { + EbliNode currentNode = it.next(); + + if (currentNode != nodeCalque_ && currentNode.getCreator() instanceof EbliWidgetCreatorVueCalque) { + EbliWidgetCreatorVueCalque new_name = (EbliWidgetCreatorVueCalque) currentNode.getCreator(); + + + if (isCompatibleWithCalque(new_name.getCalque())) { + + JLabel label = new JLabel(); + BufferedImage image = new_name.getCalque().produceImage(70, 50, params); + Icon icone = new ImageIcon(image); + + label.setIcon(icone); + label.setText(TrResource.TR.getString("Fusionner avec ") + currentNode.getTitle()); + listeObjetsCalques.add(label); + listeCalquesPossibles.add(currentNode); + } + + + } else if (currentNode != nodeCalque_ && currentNode.getCreator() instanceof EbliWidgetCreatorFusionCalques) { + + // -- on ajoute le node potentiel qui renferme une widget fusion --// + EbliWidgetCreatorFusionCalques new_name = (EbliWidgetCreatorFusionCalques) currentNode.getCreator(); + + if (isCompatibleWithCalque(new_name)) { + + JLabel label = new JLabel(); + label.setText(TrResource.TR.getString("Fusionner avec la Fusion ") + currentNode.getTitle()); + listeObjetsCalques.add(label); + listeCalquesPossibles.add(currentNode); + } + + + } + + + } + + + // -- creation graphique --// + if (jListeCalques_ == null) + jListeCalques_ = new JList(); + + modelCalquesPossibles_ = new DefaultListModel(); + + jListeCalques_.setModel(modelCalquesPossibles_); + + for (Iterator<JLabel> it = listeObjetsCalques.iterator(); it.hasNext();) { + + modelCalquesPossibles_.addElement(it.next()); + + } + jListeCalques_.setSize(250, 350); + jListeCalques_.setBorder(BorderFactory.createTitledBorder(TrResource.TR.getString("Calques possibles"))); + jListeCalques_.setCellRenderer(new GrapheCellRenderer()); + + + } + + /** + * verifie si les graphes sont compatibles + * + * @param graphe + * @return + */ + public boolean isCompatibleWithCalque(ZEbliCalquesPanel calque) { + return true; + } + + public boolean isCompatibleWithCalque(EbliWidgetCreatorFusionCalques widgetFusion) { + return true; + } + + + + + JComponent constructPanel() { + JPanel content = new JPanel(new BorderLayout()); + + content.add(new JLabel(TrResource.getS("Fusion avec un autre calque")), BorderLayout.NORTH); + content.add(new BuScrollPane(jListeCalques_), BorderLayout.CENTER); + JButton valide = new JButton(TrResource.getS("R\xE9aliser la fusion"), EbliResource.EBLI.getIcon("crystal_valider")); + valide.addActionListener(new ActionListener() { + + public void actionPerformed(ActionEvent _e) { + + mergeCalques(); + dialog_.dispose(); + + } + + }); + jListeCalques_.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); + + JPanel operations = new JPanel(new FlowLayout(FlowLayout.CENTER)); + + operations.add(valide); + content.add(operations, BorderLayout.SOUTH); + + return content; + } + + /** + * Methode qui: merge le graphe choisi dans la combo avec el ndoe actuel + * degage le node choisi de la scene remet a jour al combo actuelle + */ + private void mergeCalques() { + + int[] selected = jListeCalques_.getSelectedIndices(); + if (selected == null || selected.length==0) { + return; + } + + //-- parcours de la liste des indices selectionnes --// + for(int i=0;i<selected.length;i++){ + + EbliNode nodeToMerge = listeCalquesPossibles.get(selected[i]); + + // --recuperation de son graphe --// + + //cas bordure + if (nodeToMerge.getWidget() instanceof EbliWidgetBordureSingle){ + if(((EbliWidgetBordureSingle) nodeToMerge.getWidget()).getIntern() instanceof EbliWidgetVueCalque){ + EbliWidgetVueCalque calqueWidget = (EbliWidgetVueCalque) ((EbliWidgetBordureSingle) nodeToMerge.getWidget()).getIntern(); + // -- ajout de la widget cible a la liste a merger --// + listeTotaleWidgetToMerge_.add(calqueWidget); + + // -- suppression du noeud de la scene--// + if (nodeToMerge != null) + scene_.removeNodeWithEdges(nodeToMerge); + } + else + //-- cas le noeud selectionne contient des fusionWidget + if(((EbliWidgetBordureSingle) nodeToMerge.getWidget()).getIntern() instanceof EbliWidgetFusionCalques){ + + EbliWidgetFusionCalques calqueWidget = (EbliWidgetFusionCalques) ((EbliWidgetBordureSingle) nodeToMerge.getWidget()).getIntern(); + // -- ajout de toutes les widgets de la FusionWidget --// + for(int k=0;k< calqueWidget.getNbWidgets();k++) + listeTotaleWidgetToMerge_.add(calqueWidget.getWidgetCalque(k)); + + // -- suppression du noeud de la scene--// + if (nodeToMerge != null) + scene_.removeNodeWithEdges(nodeToMerge); + } + + + + } + else{ + if( nodeToMerge.getWidget() instanceof EbliWidgetVueCalque){ + EbliWidgetVueCalque calqueWidget = (EbliWidgetVueCalque) nodeToMerge.getWidget(); + // -- ajout de la widget cible a la liste a merger --// + listeTotaleWidgetToMerge_.add(calqueWidget); + + // -- suppression du noeud de la scene--// + if (nodeToMerge != null) + scene_.removeNodeWithEdges(nodeToMerge); + } + else + //-- cas le noeud selectionne contient des fusionWidget + if( nodeToMerge.getWidget()instanceof EbliWidgetFusionCalques){ + + EbliWidgetFusionCalques calqueWidget = (EbliWidgetFusionCalques) nodeToMerge.getWidget(); + // -- ajout de toutes les widgets de la FusionWidget --// + for(int k=0;k< calqueWidget.getNbWidgets();k++) + listeTotaleWidgetToMerge_.add(calqueWidget.getWidgetCalque(k)); + + // -- suppression du noeud de la scene--// + if (nodeToMerge != null) { + scene_.removeNodeWithEdges(nodeToMerge); + scene_.refresh(); + } + } + + } + } + + + + + + FuLog.warning("NB LISTE DES WIDGETS: " + listeTotaleWidgetToMerge_.size()); + + // --ajout de la courbe au widget de base --// + new CtuluTaskOperationGUI(projet_.impl_, TrResource.getS("Fusion avec un autre calque")) { + + public void act() { + final ProgressionInterface prog = new ProgressionBuAdapter(this); + + + // -- creation de la nouvelle widget contenant les 2 calques --// + EbliNode nodeFusion = new EbliNodeDefault(); + nodeFusion.setTitle(TrResource.getS("Fusion de calques")); + + nodeFusion.setCreator(new EbliWidgetCreatorFusionCalques(widgetCalque_, listeTotaleWidgetToMerge_)); + + scene_.addNode(nodeFusion); + + } + }.start(); + ; + + + + + // --suppression du calque de base --// + scene_.removeNodeWithEdges(nodeCalque_); + + scene_.refresh(); + + // -- maj de la combo --// + remplirCombo(); + + } + + + public void actionPerformed(ActionEvent _e) { + + // -- r... [truncated message content] |
From: <emm...@us...> - 2008-09-15 13:34:53
|
Revision: 3925 http://fudaa.svn.sourceforge.net/fudaa/?rev=3925&view=rev Author: emmanuel_martin Date: 2008-09-15 13:34:59 +0000 (Mon, 15 Sep 2008) Log Message: ----------- Am?\195?\169lioration de l'interface utilisateur et correction dans la gestion des attributs pour les rectangles et les ?\195?\169llipses. Modified Paths: -------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BVueCalque.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttibutesContainer.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorLigneBriseePanel.java Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BVueCalque.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BVueCalque.java 2008-09-14 20:51:52 UTC (rev 3924) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BVueCalque.java 2008-09-15 13:34:59 UTC (rev 3925) @@ -518,7 +518,9 @@ // Mouse // MouseMotion - public void mouseEntered(final MouseEvent _evt) {} + public void mouseEntered(final MouseEvent _evt) { + grabFocus(); + } public void mouseExited(final MouseEvent _evt) {} Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java 2008-09-14 20:51:52 UTC (rev 3924) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZCalqueEditionInteraction.java 2008-09-15 13:34:59 UTC (rev 3925) @@ -17,11 +17,18 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Set; import java.util.Vector; +import java.util.Map.Entry; +import javax.swing.JComponent; + import org.fudaa.ctulu.CtuluLib; import org.fudaa.ctulu.CtuluLibGeometrie; import org.fudaa.ctulu.CtuluLibString; +import org.fudaa.ctulu.gis.GISAttributeInterface; import org.fudaa.ebli.calque.BCalqueInteraction; import org.fudaa.ebli.calque.dessin.DeForme; import org.fudaa.ebli.calque.dessin.DeLigneBrisee; @@ -540,6 +547,7 @@ private ZEditionAttibutesContainer.LigneBriseeData data_; private boolean moved_; // Vrai quand le curseur est en mouvement private Vector<Integer> keyPresse_; // Pour la gestion du mode 'carre' + private HashMap<GISAttributeInterface, JComponent> attributs_; public FormDelegateEllipse(){ keyPresse_=new Vector<Integer>(); @@ -615,10 +623,6 @@ public void mousePressed(final MouseEvent _e) { if (origine_==null) { origine_=getPointReel(_e); - if (features_!=null) - data_=features_.createEllipseData(); - if (data_!=null) - data_.addPoint(); if (support_!=null) support_.atomicChanged(); moved_=false; @@ -682,7 +686,42 @@ */ public void keyTyped(KeyEvent _e) {} - private GrPolygone getPolygone(){ + public void setDataAttributs(HashMap<GISAttributeInterface, JComponent> _attributs){ + attributs_ = _attributs; + } + + public boolean isSetDataAttributs(){ + return attributs_ != null; + } + + private void addData() { + if (data_!=null&&attributs_!=null) { + // Pour chaque propri\xE9t\xE9es + for (Entry<GISAttributeInterface, JComponent> element : attributs_.entrySet()) { + GISAttributeInterface key=element.getKey(); + Object value=key.getEditor().getValue(element.getValue()); + // Si elle existe : inscrire la valeur + if (data_.atomicAttribute_.containsKey(key)) { + ArrayList<Object> values=data_.atomicAttribute_.get(key); + for (int i=0; i<values.size(); i++) + values.set(i, value); + } + // Si elle n'existe pas la cr\xE9er pour tout les points et inscrire la + // valeur + else { + ArrayList<Object> values=new ArrayList<Object>(data_.nbGeom_); + for (int i=0; i<data_.nbGeom_; i++) + values.add(value); + data_.atomicAttribute_.put(key, values); + } + } + } + } + + private GrPolygone getPolygone(boolean _withData){ + if(data_ == null && features_ != null) + data_ = features_.createEllipseData(); + if(data_==null) _withData = false; GrPolygone poly = new GrPolygone(); if(origine_ == null) return poly; @@ -691,8 +730,16 @@ return poly; } final double incT=(2*Math.PI)/nbPoints_; - for(double t = 0; t< 2*Math.PI;t+=incT) - poly.sommets_.ajoute(getXEllipse(t)+origine_.x_, getYEllipse(t)+origine_.y_, 0); + if (_withData) { + data_.atomicAttribute_.clear(); + data_.nbGeom_=0; + } + for (double t=0; t<2*Math.PI; t+=incT) { + poly.sommets_.ajoute(getXEllipse(t)+origine_.x_, getYEllipse(t)+origine_.y_, 0); + if(_withData) data_.addPoint(); + } + // Mise a jour des attributs + if(_withData) addData(); return poly; } @@ -700,25 +747,32 @@ if (origine_!=null&&grandRayon_!=0&&petitRayon_!=0) { final Graphics2D g=(Graphics2D)getGraphics(); g.setXORMode(Color.white); + // Recup\xE9ration des points + VecteurGrPoint points=getPolygone(false).sommets_; // Trace l'ellipse - GrPoint tmp=new GrPoint(); - tmp.initialiseAvec(origine_); - tmp.autoApplique(getVersEcran()); - - - TraceGeometrie tg = new TraceGeometrie(getVersEcran()); - tg.dessineEllipse(g, new GrPoint(origine_.x_+grandRayon_, origine_.y_+petitRayon_, 0), new GrPoint(origine_.x_-grandRayon_, origine_.y_ + petitRayon_, 0), new GrPoint(origine_.x_-grandRayon_, origine_.y_-petitRayon_, 0), new GrPoint(origine_.x_+grandRayon_, origine_.y_ - petitRayon_, 0), false, false); - /*g.setColor(tp_.getCouleur()); - g.drawOval((int)(tmp.x_-grandRayon_), (int)(tmp.y_-petitRayon_), 2*(int)Math.round(grandRayon_), 2*(int)Math - .round(petitRayon_)); - */ - // Trace les points - VecteurGrPoint points=getPolygone().sommets_; - for (int i=0; i<points.nombre(); i++) { - tmp=points.renvoie(i); + if (points.nombre()<10) { + GrPoint tmp=new GrPoint(); + tmp.initialiseAvec(origine_); tmp.autoApplique(getVersEcran()); - tp_.dessinePoint(g, tmp.x_, tmp.y_); + TraceGeometrie tg=new TraceGeometrie(getVersEcran()); + tg.setForeground(tp_.getCouleur()); + tg.dessineEllipse(g, new GrPoint(origine_.x_+grandRayon_, origine_.y_+petitRayon_, 0), new GrPoint(origine_.x_ + -grandRayon_, origine_.y_+petitRayon_, 0), new GrPoint(origine_.x_-grandRayon_, origine_.y_-petitRayon_, 0), + new GrPoint(origine_.x_+grandRayon_, origine_.y_-petitRayon_, 0), false, false); } + // Trace les points + GrPoint pointPre=points.renvoie(0); + pointPre.autoApplique(getVersEcran()); + GrPoint pointAct; + for (int i=1; i<points.nombre(); i++) { + pointAct=points.renvoie(i); + pointAct.autoApplique(getVersEcran()); + tl_.dessineTrait(g, pointPre.x_, pointPre.y_, pointAct.x_, pointAct.y_); + pointPre = pointAct; + } + pointAct = points.renvoie(0); + // Sur ce point getVersEcran() a d\xE9j\xE0 \xE9t\xE9 fait + tl_.dessineTrait(g, pointPre.x_, pointPre.y_, pointAct.x_, pointAct.y_); } } @@ -748,7 +802,7 @@ @Override void addCurrentForme() { if (origine_!=null&&grandRayon_>0&&petitRayon_>0) { - support_.addNewPolygone(getPolygone(), data_); + support_.addNewPolygone(getPolygone(true), data_); origine_=null; grandRayon_=0; petitRayon_=0; @@ -808,7 +862,7 @@ */ @Override public GrObjet getFormeEnCours() { - return getPolygone(); + return getPolygone(true); } } @@ -820,6 +874,7 @@ private GrPoint pointDep_, pointFin_; // Les deux points d\xE9finissant le rectangle private Vector<Integer> keyPresse_; // Pour la gestion du mode 'carre' private int nbPointsLargeur_, nbPointsHauteur_; // Nombres de point ajout\xE9 sur les cot\xE9s + private HashMap<GISAttributeInterface, JComponent> attributs_; public FormDelegateRectangle() { super(); @@ -828,14 +883,24 @@ nbPointsHauteur_ = 0; } + public void setDataAttributs(HashMap<GISAttributeInterface, JComponent> _attributs){ + attributs_ = _attributs; + } + + public boolean isSetDataAttributs(){ + return attributs_ != null; + } + /** * Permet de renseigner le point d'origine de la forme. * * @param _origine */ public void setPointOrigine(GrPoint _origine) { - if (_origine!=null) + if (_origine!=null){ + effaceDessin(); pointDep_=_origine; + } } /** @@ -844,8 +909,10 @@ * @param _fin */ public void setPointFin(GrPoint _fin) { - if (_fin!=null) + if (_fin!=null){ + effaceDessin(); pointFin_=_fin; + } } /** @@ -892,7 +959,7 @@ private void realiseDessin() { final Graphics2D g=(Graphics2D)getGraphics(); g.setXORMode(Color.white); - VecteurGrPoint points=getPolygone().sommets_; + VecteurGrPoint points=getPolygone(false).sommets_; GrPoint pointPre = points.renvoie(0); pointPre.autoApplique(getVersEcran()); GrPoint pointAct; @@ -958,10 +1025,6 @@ public void mousePressed(final MouseEvent _e) { if (pointDep_ == null) { pointDep_ = getPointReel(_e); - if (features_ != null) - data_ = features_.createRectangleData(); - if (data_ != null) - data_.addPoint(); if (support_ != null) support_.atomicChanged(); moved_ = false; @@ -1027,7 +1090,34 @@ */ public void keyTyped(KeyEvent _e) {} - private GrPolygone getPolygone(){ + private void addData() { + if (data_!=null&&attributs_!=null) { + // Pour chaque propri\xE9t\xE9es + for (Entry<GISAttributeInterface, JComponent> element : attributs_.entrySet()) { + GISAttributeInterface key=element.getKey(); + Object value=key.getEditor().getValue(element.getValue()); + // Si elle existe : inscrire la valeur + if (data_.atomicAttribute_.containsKey(key)) { + ArrayList<Object> values=data_.atomicAttribute_.get(key); + for (int i=0; i<values.size(); i++) + values.set(i, value); + } + // Si elle n'existe pas la cr\xE9er pour tout les points et inscrire la + // valeur + else { + ArrayList<Object> values=new ArrayList<Object>(data_.nbGeom_); + for (int i=0; i<data_.nbGeom_; i++) + values.add(value); + data_.atomicAttribute_.put(key, values); + } + } + } + } + + private GrPolygone getPolygone(boolean _withData){ + if(data_ == null && features_ != null) + data_ = features_.createRectangleData(); + if(data_==null) _withData = false; GrPolygone poly = new GrPolygone(); if(pointDep_ == null) return poly; @@ -1035,31 +1125,45 @@ poly.sommets_.ajoute(pointDep_); return poly; } + if(_withData){ + data_.atomicAttribute_.clear(); + data_.nbGeom_=0; + } double x0=Math.min(pointDep_.x_, pointFin_.x_), y0=Math.min(pointDep_.y_, pointFin_.y_), z0=pointDep_.z_, x1=Math.max(pointDep_.x_, pointFin_.x_), y1=Math.max(pointDep_.y_, pointFin_.y_); double largeur = Math.abs(x1 - x0), hauteur = Math.abs(y1 - y0); // Ajout des sommets dans le bonne ordre poly.sommets_.ajoute(x0, y0, z0); - for (int i=0; i<nbPointsHauteur_; i++) + if(_withData) data_.addPoint(); + for (int i=0; i<nbPointsHauteur_; i++){ poly.sommets_.ajoute(x0, y0 + (i + 1) * (hauteur / (nbPointsHauteur_ + 1)), z0); + if(_withData) data_.addPoint(); + } poly.sommets_.ajoute(x0, y1, z0); - for (int i=0; i<nbPointsLargeur_; i++) + if(_withData) data_.addPoint(); + for (int i=0; i<nbPointsLargeur_; i++){ poly.sommets_.ajoute(x0 + (i + 1) * (largeur / (nbPointsLargeur_ + 1)), y1, z0); + if(_withData) data_.addPoint(); + } poly.sommets_.ajoute(x1, y1, z0); - for (int i=nbPointsHauteur_; i>0; i--) + if(_withData) data_.addPoint(); + for (int i=nbPointsHauteur_; i>0; i--){ poly.sommets_.ajoute(x1, y1 - (nbPointsHauteur_ - i + 1) * hauteur / (nbPointsHauteur_ + 1), z0); - poly.sommets_.ajoute(x1, y0, z0); - for (int i=nbPointsLargeur_; i>0; i--) + if(_withData) data_.addPoint(); + } + poly.sommets_.ajoute(x1, y0, z0); + if(_withData) data_.addPoint(); + for (int i=nbPointsLargeur_; i>0; i--){ poly.sommets_.ajoute(x1 - (nbPointsLargeur_ - i + 1) * largeur / (nbPointsLargeur_ + 1), y0, z0); + if(_withData) data_.addPoint(); + } + // Mise a jour des attributs + if(_withData) addData(); return poly; } void addCurrentForme() { if (pointDep_!=null&&pointFin_!=null) { - if (data_!=null) { - if (data_.getNumGeometry()<2) - data_.addPoint(); - } - support_.addNewPolygone(getPolygone(), data_); + support_.addNewPolygone(getPolygone(true), data_); pointDep_=null; pointFin_=null; data_=null; Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttibutesContainer.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttibutesContainer.java 2008-09-14 20:51:52 UTC (rev 3924) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditionAttibutesContainer.java 2008-09-15 13:34:59 UTC (rev 3925) @@ -30,20 +30,20 @@ */ public class LigneBriseeData extends ZEditionAttributesDataI { - final Map globalAttribute_; - final Map atomicAttribute_; + final HashMap<GISAttributeInterface, Object> globalAttribute_; + final HashMap<GISAttributeInterface, ArrayList<Object>> atomicAttribute_; /** * Construit les maps par defaut. */ public LigneBriseeData() { - globalAttribute_ = new HashMap(); - atomicAttribute_ = new HashMap(); + globalAttribute_ = new HashMap<GISAttributeInterface, Object>(); + atomicAttribute_ = new HashMap<GISAttributeInterface, ArrayList<Object>>(); if (name_ != null) { for (int i = name_.length - 1; i >= 0; i--) { final GISAttributeInterface att = name_[i]; if (att.isAtomicValue()) { - atomicAttribute_.put(att, new ArrayList(20)); + atomicAttribute_.put(att, new ArrayList<Object>(20)); } else { globalAttribute_.put(att, null); } @@ -198,20 +198,6 @@ public RectangleData() { super(); } - - public void addPoint() { - super.addPoint(); - if (super.nbGeom_ == 2) { - for (final Iterator it = atomicAttribute_.values().iterator(); it.hasNext();) { - final ArrayList l = (ArrayList) it.next(); - final Object last = l.get(l.size() - 1); - l.add(last); - l.add(last); - l.add(last); - } - } - } - } /** Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java 2008-09-14 20:51:52 UTC (rev 3924) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorDefault.java 2008-09-15 13:34:59 UTC (rev 3925) @@ -64,7 +64,7 @@ * @author Fred Deniger * @version $Id: ZEditorDefault.java,v 1.20.6.5 2008-05-13 12:10:24 bmarchan Exp $ */ -public class ZEditorDefault implements ZCalqueEditionInteractionTargetI, ZEditorInterface, KeyListener, +public class ZEditorDefault implements ZCalqueEditionInteractionTargetI, ZEditorInterface, PropertyChangeListener, ZCalqueDeplacementTargetInterface { class CommandSaisieMultiple implements CtuluCommandPersitant { @@ -175,11 +175,9 @@ */ public ZEditorDefault(final ZEbliCalquesPanel _panel, final ZSceneEditor _editor) { super(); - keyListener = new Vector<KeyListener>(); panel_ = _panel; sceneEditor_=_editor; // panel_.addKeyListener(this); - panel_.getVueCalque().addKeyListener(this); buildDeletesAction(); EbliLib.updateMapKeyStroke(_panel, getDeleteActions()); installSceneActions(); @@ -392,7 +390,7 @@ if (forme >= 0) { if (dessin_ == null) { dessin_ = new ZCalqueEditionInteraction(this); - addKeyListener(dessin_); + panel_.getVueCalque().addKeyListener(dessin_); dessin_.setName("cqInteractifDessin"); panel_.addCalqueInteraction(dessin_); dessin_.addPropertyChangeListener("gele", this); @@ -549,24 +547,6 @@ public boolean isEditable(final Object _target) { return _target instanceof ZCalqueEditable; } - - Vector<KeyListener> keyListener; - - public void addKeyListener(KeyListener _l){ - if(!keyListener.contains(_l)) - keyListener.add(_l); - } - - public void removeKeyListener(KeyListener _l){ - if(keyListener.contains(_l)) - keyListener.remove(_l); - } - - public void keyPressed(final KeyEvent _e) { - for(KeyListener l : keyListener){ - l.keyPressed(_e); - } - } // Pas sur que la m\xE9thode soit utilis\xE9. public void keyReleased(final KeyEvent _e) { @@ -577,9 +557,6 @@ // } // ((ZCalqueEditable) calque).removeSelectedObjects(mng_, null); // } - for(KeyListener l : keyListener){ - l.keyReleased(_e); - } if (_e.getKeyCode() == KeyEvent.VK_DELETE) { delete(); } @@ -591,12 +568,6 @@ } } - public void keyTyped(final KeyEvent _e) { - for(KeyListener l : keyListener){ - l.keyTyped(_e); - } - } - public void moved(final double _dx, final double _dy, final double _dz) { sceneEditor_.moveSelectedObjects(_dx, _dy, _dz); // ZCalqueEditable[] cqs=getSupport().getEditableLayers(); Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorLigneBriseePanel.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorLigneBriseePanel.java 2008-09-14 20:51:52 UTC (rev 3924) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZEditorLigneBriseePanel.java 2008-09-15 13:34:59 UTC (rev 3925) @@ -1,935 +1,1013 @@ -/* - * @creation 4 avr. 2005 - * @modification $Date: 2008-03-26 16:46:43 $ - * @license GNU General Public License 2 - * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne - * @mail de...@fu... - */ -package org.fudaa.ebli.calque.edition; - -import java.awt.BorderLayout; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import javax.swing.Box; -import javax.swing.BoxLayout; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.border.EmptyBorder; -import javax.swing.table.AbstractTableModel; - -import org.fudaa.ctulu.CtuluLibString; -import org.fudaa.ctulu.gis.GISAttributeInterface; -import org.fudaa.ctulu.gui.CtuluValueEditorI; -import org.fudaa.ebli.calque.dessin.DeForme; -import org.fudaa.ebli.calque.edition.ZCalqueEditionInteraction.FormDelegateEllipse; -import org.fudaa.ebli.calque.edition.ZCalqueEditionInteraction.FormDelegateRectangle; -import org.fudaa.ebli.commun.EbliFormatterInterface; -import org.fudaa.ebli.commun.EbliLib; -import org.fudaa.ebli.geometrie.GrPoint; -import org.fudaa.ebli.geometrie.GrPolyligne; -import org.fudaa.ebli.ressource.EbliResource; - -import com.memoire.bu.BuButton; -import com.memoire.bu.BuGridLayout; -import com.memoire.bu.BuLabel; -import com.memoire.bu.BuPanel; -import com.memoire.bu.BuResource; -import com.memoire.bu.BuScrollPane; -import com.memoire.bu.BuTable; -import com.memoire.bu.BuTextField; -import com.memoire.bu.BuVerticalLayout; -import com.memoire.fu.Fu; -import com.memoire.fu.FuLog; - -/** - * Un panneau d'\xE9dition d'une ligne bris\xE9e qui s'affiche lorsque l'outil ligne bris\xE9e est s\xE9lectionn\xE9. - * Ce panneau est inclu dans le panneau des outils. - * - * @author Fred Deniger - * @version $Id: ZEditorLigneBriseePanel.java,v 1.21.4.3 2008-03-26 16:46:43 bmarchan Exp $ - */ -public class ZEditorLigneBriseePanel extends BuPanel implements ZEditionAttributesCreatorInterface, ZEditorPanelInterface, ActionListener { - - protected class ValueModel extends AbstractTableModel { - - GISAttributeInterface[] atomicAttr_; - - protected ValueModel() { - updateAtomicArrays(); - } - - protected void updateAtomic() { - super.fireTableDataChanged(); - } - - protected final void updateAtomicArrays() { - if (editorComps_ != null && editorAttribute_ != null && editorAttribute_.size() > 0) { - final List r = new ArrayList(editorAttribute_.size()); - for (final Iterator it = editorAttribute_.keySet().iterator(); it.hasNext();) { - final GISAttributeInterface att = (GISAttributeInterface) it.next(); - if (att.isAtomicValue()) { - r.add(att); - } - } - atomicAttr_ = new GISAttributeInterface[r.size()]; - r.toArray(atomicAttr_); - } - } - - public Class getColumnClass(final int _columnIndex) { - if (_columnIndex > 2) { - return atomicAttr_[_columnIndex - 3].getDataClass(); - } - return Double.class; - } - - public int getColumnCount() { - return 3 + (atomicAttr_ == null ? 0 : atomicAttr_.length); - } - - public String getColumnName(final int _column) { - if (_column == 0) { - return CtuluLibString.ESPACE; - } - if (_column == 1) { - return "X"; - } - if (_column == 2) { - return "Y"; - } - final int idxFeature = _column - 3; - if (atomicAttr_ != null) { - return atomicAttr_[idxFeature].getName(); - } - return super.getColumnName(_column); - } - - public int getRowCount() { - final ZCalqueEditionInteraction.FormDelegate forme = edition_.getFormeEnCours(); - if (!forme.enCours()) { - return 0; - } - if (forme.getForme() == DeForme.RECTANGLE) { - return 1; - } - return forme.enCours() ? ((GrPolyligne) forme.getFormeEnCours()).nombre() : 0; - } - - public Object getValueAt(final int _rowIndex, final int _columnIndex) { - if (_columnIndex == 0) { - return CtuluLibString.getString(_rowIndex + 1); - } - final ZCalqueEditionInteraction.FormDelegate forme = edition_.getFormeEnCours(); - if (!forme.enCours()) { - return CtuluLibString.EMPTY_STRING; - } - final boolean isRect = forme.getForme() == DeForme.RECTANGLE; - GrPolyligne o = null; - GrPoint init = null; - if (isRect) { - init = (GrPoint) forme.getFormeEnCours(); - } else { - o = (GrPolyligne) forme.getFormeEnCours(); - } - if (o != null) { - if (_columnIndex == 1) { - if (init == null) { - return formatter_.getXYFormatter().format(o.sommets_.renvoieX(_rowIndex)); - } - formatter_.getXYFormatter().format(init.x_); - } else if (_columnIndex == 2) { - if (init == null) { - return formatter_.getXYFormatter().format(o.sommets_.renvoieY(_rowIndex)); - } - formatter_.getXYFormatter().format(init.y_); - } else if (atomicAttr_ != null) { - final int featureIdx = _columnIndex - 3; - if (featureIdx >= 0 && attributes_ != null && attributes_.length > 0) { - return forme.getData().getValue(atomicAttr_[featureIdx], _rowIndex); - } - - } - } - return null; - } - - public boolean isCellEditable(final int _rowIndex, final int _columnIndex) { - return _columnIndex > 0; - } - - public void setValueAt(final Object _value, final int _rowIndex, final int _columnIndex) { - if (_value == null) return; - final ZCalqueEditionInteraction.FormDelegate forme = edition_.getFormeEnCours(); - final boolean isRect = forme.getForme() == DeForme.RECTANGLE; - GrPolyligne o = null; - GrPoint init = null; - if (isRect) { - init = (GrPoint) forme.getFormeEnCours(); - } else { - o = (GrPolyligne) forme.getFormeEnCours(); - } - if (o != null && o.sommets_ != null) { - if (_columnIndex == 1) { - if (init == null) { - o.sommets_.setX(Double.parseDouble(_value.toString()), _rowIndex); - } else { - init.x_ = Double.parseDouble(_value.toString()); - } - edition_.repaint(); - - } else if (_columnIndex == 2) { - if (init == null) { - o.sommets_.setY(Double.parseDouble(_value.toString()), _rowIndex); - } else { - init.y_ = Double.parseDouble(_value.toString()); - - } - edition_.repaint(); - - } else if (atomicAttr_ != null) { - forme.getData().setValue(atomicAttr_[_columnIndex - 3], _rowIndex, _value); - } - } - super.fireTableDataChanged(); - } - - } - - /** - * Interface graphique permettant de g\xE9rer les propri\xE9t\xE9s de l'ellipse lors de - * sa construction - * - * @author Emmanuel Martin - */ - protected class EllipseParameterGUI extends BuPanel implements ActionListener { - - private BuTextField tfCoordX_; - private BuTextField tfCoordY_; - private BuTextField tfRayonX_; - private BuTextField tfRayonY_; - private BuTextField tfNbPoints_; - private boolean userRayonX_; - private boolean userRayonY_; - - public EllipseParameterGUI() { - super(); - userRayonX_=false; - userRayonY_=false; - int hauteur=20; - int largeur=60; - setBorder(new EmptyBorder(2, 2, 2, 2)); - // Create BuTextFields & Dimension - tfCoordX_=BuTextField.createDoubleField(); - tfCoordY_=BuTextField.createDoubleField(); - tfRayonX_=BuTextField.createDoubleField(); - tfRayonY_=BuTextField.createDoubleField(); - tfNbPoints_=BuTextField.createIntegerField(); - tfCoordX_.setPreferredSize(new Dimension(largeur, hauteur)); - tfCoordY_.setPreferredSize(new Dimension(largeur, hauteur)); - tfRayonX_.setPreferredSize(new Dimension(largeur, hauteur)); - tfRayonY_.setPreferredSize(new Dimension(largeur, hauteur)); - tfNbPoints_.setPreferredSize(new Dimension(largeur, hauteur)); - // ActionListener - tfCoordX_.addActionListener(this); - tfCoordY_.addActionListener(this); - tfRayonX_.addActionListener(this); - tfRayonY_.addActionListener(this); - tfNbPoints_.addActionListener(this); - // Default value - tfNbPoints_.setText("3"); - // Conteneur principal - Box mainContainer=new Box(BoxLayout.Y_AXIS); - Box head=new Box(BoxLayout.X_AXIS); - Container foot=new Container(); - foot.setLayout(new GridLayout(1, 1, 0, 0)); - // Gestion des coordonn\xE9es - Box tmp=new Box(BoxLayout.Y_AXIS); - tmp.add(new JLabel(EbliResource.EBLI.getString("Coord X "))); - tmp.add(new JLabel(EbliResource.EBLI.getString("Coord Y "))); - head.add(tmp); - tmp=new Box(BoxLayout.Y_AXIS); - tmp.add(tfCoordX_); - tmp.add(tfCoordY_); - head.add(tmp); - // Taille - tmp=new Box(BoxLayout.Y_AXIS); - tmp.add(new JLabel(EbliResource.EBLI.getString("RayonX "))); - tmp.add(new JLabel(EbliResource.EBLI.getString("RayonY "))); - head.add(tmp); - tmp=new Box(BoxLayout.Y_AXIS); - tmp.add(tfRayonX_); - tmp.add(tfRayonY_); - head.add(tmp); - // Nombre de point - foot.add(new JLabel(EbliResource.EBLI.getString("Nombre de Points:"))); - foot.add(tfNbPoints_); - // Add to mainContainer - mainContainer.add(head); - mainContainer.add(foot); - // Add to Panel - add(mainContainer); - } - - /** - * Met \xE0 jour le contenu de l'interface en cas de changement des coordonn\xE9es - * du point d'origine. - */ - public void update() { - if (edition_!=null&&edition_.getFormeEnCours()!=null&&edition_.getFormeEnCours().enCours()) { - GrPoint pointOrigine=((FormDelegateEllipse)edition_.getFormeEnCours()).getPointOrigine(); - if (pointOrigine!=null) { - tfCoordX_.setText(formatter_.getXYFormatter().format(new Double(pointOrigine.x_))); - tfCoordY_.setText(formatter_.getXYFormatter().format(new Double(pointOrigine.y_))); - } - else { - tfCoordX_.setText(""); - tfCoordY_.setText(""); - } - } - } - - /** - * Cette m\xE9thode g\xE8re la mise \xE0 jour de l'interface lors de mouvement de la - * souris. - * - * @param _x - * : coordonn\xE9e x de la sourie - * @param _y - * coordonn\xE9e y de la sourie - */ - public void updateMove(double _x, double _y) { - if (edition_!=null&&edition_.getFormeEnCours()!=null&&edition_.getFormeEnCours().enCours()) { - GrPoint pointOrigine=((FormDelegateEllipse)edition_.getFormeEnCours()).getPointOrigine(); - tfRayonX_.setText(formatter_.getXYFormatter().format(new Double(Math.abs(_x-pointOrigine.x_)))); - tfRayonY_.setText(formatter_.getXYFormatter().format(new Double(Math.abs(_y-pointOrigine.y_)))); - userRayonX_=false; - userRayonY_=false; - } - } - - /** - * Si un rayon est donn\xE9 par l'utilisateur, fnir l'ellipse celle-ci, sinon - * ne fait rien. - */ - private void buildEllipse() { - if (edition_!=null&&edition_.getFormeEnCours()!=null&&userRayonX_&&userRayonY_) { - ((FormDelegateEllipse)edition_.getFormeEnCours()).buildEllipse(); - } - userRayonX_=false; - userRayonY_=false; - } - - /* - * (non-Javadoc) - * - * @see - * java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ - public void actionPerformed(ActionEvent _e) { - if (edition_!=null&&edition_.getFormeEnCours()!=null&&edition_.getFormeEnCours().getForme()==DeForme.ELLIPSE) { - boolean error=false; - if (_e.getSource()==tfCoordX_||_e.getSource()==tfCoordY_) { - double x=0, y=0; - try { - x=Double.parseDouble(tfCoordX_.getText()); - } - catch (NumberFormatException ex) { - tfCoordX_.setText(""); - error=true; - } - try { - y=Double.parseDouble(tfCoordY_.getText()); - } - catch (NumberFormatException ex) { - tfCoordY_.setText(""); - error=true; - } - if (!error) - ((FormDelegateEllipse)edition_.getFormeEnCours()).setPointOrigine(new GrPoint(x, y, 0)); - } - else if (_e.getSource()==tfNbPoints_) { - try { - ((FormDelegateEllipse)edition_.getFormeEnCours()).setNbPoints(Integer.parseInt(tfNbPoints_.getText())); - } - catch (NumberFormatException ex) { - tfNbPoints_.setText(""); - } - } - else if (_e.getSource()==tfRayonX_) { - try { - ((FormDelegateEllipse)edition_.getFormeEnCours()).setRayonX(Double.parseDouble(tfRayonX_.getText())); - userRayonX_=true; - } - catch (NumberFormatException ex) { - tfRayonX_.setText(""); - } - } - else if (_e.getSource()==tfRayonY_) { - try { - ((FormDelegateEllipse)edition_.getFormeEnCours()).setRayonY(Double.parseDouble(tfRayonY_.getText())); - userRayonY_=true; - } - catch (NumberFormatException ex) { - tfRayonY_.setText(""); - } - // Construction de l'ellipse avec les donn\xE9es du panel - buildEllipse(); - } - else { - // Mise a jour de l'interface graphique suite \xE0 une action de - // l'utilisateur - update(); - } - } - } - } - - /** - * Interface graphique permettant de g\xE9rer les propri\xE9t\xE9s du rectangle lors de - * sa construction - * - * @author Emmanuel Martin - */ - protected class RectangleParameterGUI extends BuPanel implements ActionListener { - - private BuTextField tfCoordX_; - private BuTextField tfCoordY_; - private BuTextField tfSizeY_; - private BuTextField tfSizeX_; - private BuTextField tfNbPointX_; - private BuTextField tfNbPointY_; - private boolean userSizeX_; - private boolean userSizeY_; - - public RectangleParameterGUI() { - super(); - userSizeX_=false; - userSizeY_=false; - int hauteur=20; - int largeur=60; - setBorder(new EmptyBorder(2, 2, 2, 2)); - // Create BuTextFields & Dimension - tfCoordX_=BuTextField.createDoubleField(); - tfCoordY_=BuTextField.createDoubleField(); - tfSizeY_=BuTextField.createDoubleField(); - tfSizeX_=BuTextField.createDoubleField(); - tfNbPointY_=BuTextField.createIntegerField(); - tfNbPointX_=BuTextField.createIntegerField(); - tfCoordX_.setPreferredSize(new Dimension(largeur, hauteur)); - tfCoordY_.setPreferredSize(new Dimension(largeur, hauteur)); - tfSizeY_.setPreferredSize(new Dimension(largeur, hauteur)); - tfSizeX_.setPreferredSize(new Dimension(largeur, hauteur)); - tfNbPointY_.setPreferredSize(new Dimension(largeur, hauteur)); - tfNbPointX_.setPreferredSize(new Dimension(largeur, hauteur)); - // ActionListener - tfCoordX_.addActionListener(this); - tfCoordY_.addActionListener(this); - tfSizeY_.addActionListener(this); - tfSizeX_.addActionListener(this); - tfNbPointY_.addActionListener(this); - tfNbPointX_.addActionListener(this); - // Default value - tfNbPointY_.setText("0"); - tfNbPointX_.setText("0"); - // Conteneur principal - Box mainContainer=new Box(BoxLayout.Y_AXIS); - Box head=new Box(BoxLayout.X_AXIS); - Container foot=new Container(); - foot.setLayout(new GridLayout(2, 2, 0, 0)); - // Gestion des coordonn\xE9es - Box tmp=new Box(BoxLayout.Y_AXIS); - tmp.add(new JLabel(EbliResource.EBLI.getString("Coord X "))); - tmp.add(new JLabel(EbliResource.EBLI.getString("Coord Y "))); - head.add(tmp); - tmp=new Box(BoxLayout.Y_AXIS); - tmp.add(tfCoordX_); - tmp.add(tfCoordY_); - head.add(tmp); - // Taille - tmp=new Box(BoxLayout.Y_AXIS); - tmp.add(new JLabel(EbliResource.EBLI.getString("Hauteur "))); - tmp.add(new JLabel(EbliResource.EBLI.getString("Largeur "))); - head.add(tmp); - tmp=new Box(BoxLayout.Y_AXIS); - tmp.add(tfSizeY_); - tmp.add(tfSizeX_); - head.add(tmp); - // Nombre de point - foot.add(new JLabel(EbliResource.EBLI.getString("Nb points Hauteur :"))); - foot.add(tfNbPointY_); - foot.add(new JLabel(EbliResource.EBLI.getString("Nb points Largeur :"))); - foot.add(tfNbPointX_); - // Add to mainContainer - mainContainer.add(head); - mainContainer.add(foot); - // Add to Panel - add(mainContainer); - } - - /** - * Met \xE0 jour le contenu de l'interface en cas de changement des coordonn\xE9es - * du point d'origine. - */ - public void update() { - if (edition_!=null&&edition_.getFormeEnCours()!=null&&edition_.getFormeEnCours().enCours()) { - GrPoint pointOrigine=(GrPoint)edition_.getFormeEnCours().getFormeEnCours(); - if (pointOrigine!=null) { - tfCoordX_.setText(formatter_.getXYFormatter().format(new Double(pointOrigine.x_))); - tfCoordY_.setText(formatter_.getXYFormatter().format(new Double(pointOrigine.y_))); - } - else { - tfCoordX_.setText(""); - tfCoordY_.setText(""); - } - } - } - - /** - * Cette m\xE9thode g\xE8re la mise \xE0 jour de l'interface lors de mouvement de la - * souris. - * - * @param _x - * : coordonn\xE9e x de la sourie - * @param _y - * coordonn\xE9e y de la sourie - */ - public void updateMove(double _x, double _y) { - if (edition_!=null&&edition_.getFormeEnCours()!=null&&edition_.getFormeEnCours().enCours()) { - GrPoint pointOrigine=(GrPoint)edition_.getFormeEnCours().getFormeEnCours(); - tfSizeX_.setText(formatter_.getXYFormatter().format(new Double(Math.abs(_x-pointOrigine.x_)))); - tfSizeY_.setText(formatter_.getXYFormatter().format(new Double(Math.abs(_y-pointOrigine.y_)))); - userSizeX_=false; - userSizeY_=false; - } - } - - /** - * Si une largeur ou une hauteur est donn\xE9 par l'utilisateur, finir le - * rectangle avec celle-ci, sinon ne fait rien. - */ - private void buildRectangle() { - if (edition_!=null&&edition_.getFormeEnCours()!=null&&edition_.getFormeEnCours().getFormeEnCours()!=null&&userSizeX_ - &&userSizeY_) { - double pointEndX, pointEndY, pointDebX, pointDebY; - - try { - pointDebX=((GrPoint)edition_.getFormeEnCours().getFormeEnCours()).x_; - pointDebY=((GrPoint)edition_.getFormeEnCours().getFormeEnCours()).y_; - pointEndX=Double.parseDouble(tfSizeX_.getText())+pointDebX; - pointEndY=Double.parseDouble(tfSizeY_.getText())+pointDebY; - } - catch (NumberFormatException ex) { - return; // Cas o\xF9 n'importe quoi est entr\xE9e dans les champs de saisie. - } - FormDelegateRectangle rec=((FormDelegateRectangle)edition_.getFormeEnCours()); - rec.setPointOrigine(new GrPoint(pointDebX, pointDebY, 0)); - rec.setPointFin(new GrPoint(pointEndX, pointEndY, 0)); - rec.buildRectangle(); - userSizeX_=false; - userSizeY_=false; - } - } - - /* - * (non-Javadoc) - * - * @see - * java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ - public void actionPerformed(ActionEvent e) { - if (edition_!=null&&edition_.getFormeEnCours()!=null&&edition_.getFormeEnCours().getFormeEnCours()!=null - &&edition_.getFormeEnCours().getForme()==DeForme.RECTANGLE) { - boolean error=false; - if (e.getSource()==tfCoordX_||e.getSource()==tfCoordY_) { - double x=0, y=0; - try { - x=Double.parseDouble(tfCoordX_.getText()); - } - catch (NumberFormatException ex) { - tfCoordX_.setText(""); - error=true; - } - try { - y=Double.parseDouble(tfCoordY_.getText()); - } - catch (NumberFormatException ex) { - tfCoordY_.setText(""); - error=true; - } - if (!error) - ((FormDelegateRectangle)edition_.getFormeEnCours()).setPointOrigine(new GrPoint(x, y, 0)); - } - else if (e.getSource()==tfNbPointX_||e.getSource()==tfNbPointY_) { - try { - ((FormDelegateRectangle)edition_.getFormeEnCours()).setNbPointsLargeur(Integer.parseInt(tfNbPointX_.getText())); - } - catch (NumberFormatException ex) { - tfNbPointX_.setText(""); - } - try { - ((FormDelegateRectangle)edition_.getFormeEnCours()).setNbPointsHauteur(Integer.parseInt(tfNbPointY_.getText())); - } - catch (NumberFormatException ex) { - tfNbPointY_.setText(""); - } - } - else if (e.getSource()==tfSizeY_) { - double coordX=0; - try { - coordX=Double.parseDouble(tfSizeX_.getText())+((GrPoint)edition_.getFormeEnCours().getFormeEnCours()).x_; - userSizeX_=true; - } - catch (NumberFormatException ex) { - tfSizeX_.setText(""); - } - ((FormDelegateRectangle)edition_.getFormeEnCours()).setPointFin(new GrPoint(coordX, Double.parseDouble(tfSizeY_.getText()) - +((GrPoint)edition_.getFormeEnCours().getFormeEnCours()).y_, 0)); - // Construction du rectangle avec les donn\xE9es du panel - buildRectangle(); - } - else if (e.getSource()==tfSizeX_) { - double coordY=0; - try { - coordY=Double.parseDouble(tfSizeY_.getText())+((GrPoint)edition_.getFormeEnCours().getFormeEnCours()).y_; - userSizeY_=true; - } - catch (NumberFormatException ex) { - tfSizeY_.setText(""); - } - ((FormDelegateRectangle)edition_.getFormeEnCours()).setPointFin(new GrPoint(Double.parseDouble(tfSizeX_.getText()) - +((GrPoint)edition_.getFormeEnCours().getFormeEnCours()).x_, coordY, 0)); - // Construction du rectangle avec les donn\xE9es du panel - buildRectangle(); - } - else { - // Mise a jour de l'interface graphique suite \xE0 une action de - // l'utilisateur - update(); - } - } - } - } - - private ValueModel tableModel_; - - BuButton btReprise_; - BuButton btSaveLine_; - - RectangleParameterGUI rectangleBuilderGUI_; - EllipseParameterGUI ellipseBuilderGUI_; - - ZEditionAttibutesContainer container_; - - ZCalqueEditionInteraction edition_; - - Map editorAttribute_; - - /** Type de g\xE9ometrie a \xE9diter */ - int typeForme_; - - EbliFormatterInterface formatter_; - - String initState_; - - BPaletteEdition palette_; - - protected GISAttributeInterface[] attributes_; - - protected JComponent[] editorComps_; - - /** - * @param _editor l'editeur parent - * @param _typeForme Le type de g\xE9om\xE9trie a \xE9diter. - */ - public ZEditorLigneBriseePanel(final ZEditorDefault _editor, int _typeForme) { - setLayout(new BuVerticalLayout(2, true, true)); - if (_editor.getTarget() != null && _editor.getTarget().getModelEditable().getGeomData() != null) { - attributes_ = _editor.getTarget().getModelEditable().getGeomData().getAttributes(); - } - palette_ = _editor.palette_; - edition_ = _editor.dessin_; - initState_ = _editor.getCurrentAction(); - if (btReprise_ == null) { - btReprise_ = new BuButton(); - btReprise_.setText(EbliLib.getS("Reprise")); - btReprise_.setEnabled(false); - btReprise_.addActionListener(this); - } - if (btSaveLine_ == null) { - btSaveLine_ = new BuButton(); - btSaveLine_.setText(EbliLib.getS("Ajouter la forme en cours")); - btSaveLine_.setIcon(BuResource.BU.getToolIcon("ajouter")); - btSaveLine_.setEnabled(false); - btSaveLine_.addActionListener(this); - btSaveLine_.setToolTipText("<html><body>" + EbliLib.getS("Ajouter la forme en cours") + "<br>" - + EbliLib.getS("Vous pouvez \xE9galement cliquer 2 fois pour ajouter la forme") + "<br>" - + EbliLib.getS("ou utiliser la touche 'Ctrl' et cliquer sur le dernier point de la forme")); - } - if (palette_.getSelectedButton() != null) { - btReprise_.setIcon(palette_.getSelectedButton().getIcon()); - } - add(btReprise_); - if (isParametersEditable()) { - add(btSaveLine_); - } - updateFeaturePanel(); - if (tableModel_ != null) { - tableModel_.updateAtomic(); - } - typeForme_=_typeForme; - addParametersPanel(); - - formatter_ = _editor.getXYFormatter(); - } - - /** - * Ajoute le panneau pour pr\xE9ciser les parametres de g\xE9om\xE9trie. - */ - private void addParametersPanel() { - FuLog.trace("Type de g\xE9om\xE9trie en cours: "+typeForme_); - if (!isParametersEditable()) return; - - if (typeForme_==DeForme.LIGNE_BRISEE || - typeForme_==DeForme.POLYGONE || typeForme_==DeForme.MULTI_POINT) - add(getPolyParametersPanel()); - else if(typeForme_==DeForme.RECTANGLE){ - add(getRectangleParametersPanel()); - } - else if (typeForme_==DeForme.ELLIPSE) - add(getEllipseParametersPanel()); - } - - /** - * - * @return un panneau de propri\xE9t\xE9s modifiables lors de la cr\xE9ation d'une ellipse. - */ - private JPanel getEllipseParametersPanel(){ - ellipseBuilderGUI_ = new EllipseParameterGUI(); - return ellipseBuilderGUI_; - } - - /** - * @return un panneau de propri\xE9t\xE9s modifiables lors de la cr\xE9ation d'un - * rectangle. - */ - private JPanel getRectangleParametersPanel() { - rectangleBuilderGUI_ = new RectangleParameterGUI(); - return rectangleBuilderGUI_; - } - - /** - * @return un panneau de coordonn\xE9es modifiables lors de la cr\xE9ation d'une - * polyligne. - */ - private JPanel getPolyParametersPanel() { - BuPanel pn=new BuPanel(); - pn.setLayout(new BorderLayout()); - pn.setBorder(new EmptyBorder(2, 2, 2, 2)); - tableModel_=createValueModel(); - final BuTable tb=new BuTable(tableModel_); - final BuScrollPane sp=new BuScrollPane(tb); - sp.setPreferredWidth(190); - sp.setPreferredHeight(60); - tb.getColumnModel().getColumn(0).setWidth(10); - pn.add(new BuLabel(EbliResource.EBLI.getString("Coordonn\xE9es")), BorderLayout.NORTH); - pn.add(sp, BorderLayout.CENTER); - return pn; - } - - protected final boolean isParametersEditable() { - if (edition_ == null) { - return false; - } - final ZCalqueEditionInteraction.FormDelegate delegate = edition_.getFormeEnCours(); - if (delegate != null) { - final int forme = delegate.getForme(); - if (forme == DeForme.RECTANGLE || forme == DeForme.LIGNE_BRISEE || forme == DeForme.POLYGONE || forme==DeForme.MULTI_POINT || forme==DeForme.ELLIPSE) { - return true; - } - } - return false; - } - - /** - * @return le modele a utiliser pour afficher les valeurs - */ - protected ValueModel createValueModel() { - if (isParametersEditable()) { - return new ValueModel(); - } - return null; - } - - protected void updateFeaturePanel() { - if (attributes_ != null && attributes_.length > 0) { - final BuPanel pnFeature = new BuPanel(); - pnFeature.setLayout(new BuGridLayout(2, 0, 0)); - final List editor = new ArrayList(attributes_.length); - if (editorAttribute_ == null) { - editorAttribute_ = new HashMap(); - } else { - editorAttribute_.clear(); - } - for (int i = 0; i < attributes_.length; i++) { - final GISAttributeInterface attr = attributes_[i]; - if (Fu.DEBUG && FuLog.isDebug()) { - FuLog.trace("EZM: add for " + attr.getName()); - } - if (attr.isEditable()) { - pnFeature.add(new BuLabel(attr.getName() + ':')); - final CtuluValueEditorI ed = attr.getEditor(); - final JComponent ci = ed.createEditorComponent(); - editorAttribute_.put(attr, ci); - editor.add(ci); - final Object defaultVal = attr.getDefaultValue(); - ed.setValue(defaultVal == null ? null : defaultVal.toString(), ci); - pnFeature.add(ci); - } - } - editorComps_ = (JComponent[]) editor.toArray(new JComponent[editor.size()]); - add(pnFeature); - } - } - - public void actionPerformed(final ActionEvent _e) { - if (_e.getSource() == btReprise_) { - edition_.setGele(false); - } else if (_e.getSource() == btSaveLine_) { - (edition_.getFormeEnCours()).addCurrentForme(); - } - } - - public void atomicChanged() { - if (tableModel_!=null) { - tableModel_.updateAtomic(); - } - boolean enable=false; - if (!edition_.isGele() - &&edition_.getFormeEnCours()!=null - &&edition_.getFormeEnCours().getFormeEnCours()!=null - &&(edition_.getFormeEnCours().getForme()==DeForme.POLYGONE||edition_.getFormeEnCours().getForme()==DeForme.LIGNE_BRISEE||edition_ - .getFormeEnCours().getForme()==DeForme.MULTI_POINT)) { - final int nb=((GrPolyligne)edition_.getFormeEnCours().getFormeEnCours()).nombre(); - if (edition_.getFormeEnCours().getForme()==DeForme.POLYGONE) { - enable=nb>=3; - } - else if (edition_.getFormeEnCours().getForme()==DeForme.LIGNE_BRISEE) { - enable=nb>=2; - } - else { - enable=nb>=1; - } - - } - else if (!edition_.isGele()&&edition_.getFormeEnCours()!=null&&edition_.getFormeEnCours().getFormeEnCours()!=null - &&edition_.getFormeEnCours().getForme()==DeForme.RECTANGLE && rectangleBuilderGUI_!=null) { - rectangleBuilderGUI_.update(); - }else if (!edition_.isGele()&&edition_.getFormeEnCours()!=null&&edition_.getFormeEnCours().getFormeEnCours()!=null - &&edition_.getFormeEnCours().getForme()==DeForme.ELLIPSE&&ellipseBuilderGUI_!=null) { - ellipseBuilderGUI_.update(); - } - btSaveLine_.setEnabled(enable); - } - - public void calqueInteractionChanged() { - btReprise_.setEnabled(edition_.isGele()); - if (palette_.getSelectedButton() != null) { - btReprise_.setIcon(palette_.getSelectedButton().getIcon()); - } - atomicChanged(); - } - - public void close() { - btReprise_ = null; - } - - public void editionStopped() { - btSaveLine_.setEnabled(false); - } - - public ZEditionAttibutesContainer getAttributeContainer() { - if (container_ == null || attributes_ != null) { - container_ = new ZEditionAttibutesContainer(attributes_); - container_.setCreator(this); - } - return container_; - } - - public JComponent getComponent() { - return this; - } - - public Object getData(final GISAttributeInterface _attr) { - if (editorComps_ == null) { - if (Fu.DEBUG && FuLog.isDebug()) { - FuLog.trace("EZM: " + getClass().getName() + " no component"); - } - return null; - } - final JComponent c = (JComponent) editorAttribute_.get(_attr); - if (c != null) { - if (Fu.DEBUG && FuLog.isDebug()) { - FuLog.trace("EZM: " + getClass().getName() + " component for attribute " + _attr.getName() + " value= " - + _attr.getEditor().getValue(c)); - - } - return _attr.getEditor().getValue(c); - } - if (Fu.DEBUG && FuLog.isDebug()) { - FuLog.trace("EZM: " + getClass().getName() + " NO component for attribute " + _attr.getName()); - } - return null; - } - - public AbstractTableModel getTableModel() { - return tableModel_; - } - - public void objectAdded() { - atomicChanged(); - } - - public void targetChanged(final ZCalqueEditable _new) { - GISAttributeInterface[] newAtt = null; - if (_new != null && _new.getModelEditable() != null && _new.getModelEditable().getGeomData() != null) { - newAtt = _new.getModelEditable().getGeomData().getAttributes(); - } - if (!Arrays.equals(newAtt, attributes_)) { - attributes_ = newAtt; - container_ = null; - removeAll(); - updateFeaturePanel(); - if (tableModel_ != null) { - tableModel_.updateAtomicArrays(); - } - addParametersPanel(); - } - } - - /* - * (non-Javadoc) - * - * @see - * org.fudaa.ebli.calque.edition.ZEditorPanelInterface#pointMove - * (double, double) - */ - public void pointMove(double _x, double _y) { - if (edition_!=null&&edition_.getFormeEnCours()!=null) { - if (edition_.getFormeEnCours().getForme()==DeForme.RECTANGLE) - rectangleBuilderGUI_.updateMove(_x, _y); - if (edition_.getFormeEnCours().getForme()==DeForme.ELLIPSE) - ellipseBuilderGUI_.updateMove(_x, _y); - } - } -} +/* + * @creation 4 avr. 2005 + * @modification $Date: 2008-03-26 16:46:43 $ + * @license GNU General Public License 2 + * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne + * @mail de...@fu... + */ +package org.fudaa.ebli.calque.edition; + +import java.awt.BorderLayout; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.swing.Box; +import javax.swing.BoxLayout; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.border.EmptyBorder; +import javax.swing.table.AbstractTableModel; + +import org.fudaa.ctulu.CtuluLibString; +import org.fudaa.ctulu.gis.GISAttributeInterface; +import org.fudaa.ctulu.gui.CtuluValueEditorI; +import org.fudaa.ebli.calque.dessin.DeForme; +import org.fudaa.ebli.calque.edition.ZCalqueEditionInteraction.FormDelegateEllipse; +import org.fudaa.ebli.calque.edition.ZCalqueEditionInteraction.FormDelegateRectangle; +import org.fudaa.ebli.commun.EbliFormatterInterface; +import org.fudaa.ebli.commun.EbliLib; +import org.fudaa.ebli.geometrie.GrPoint; +import org.fudaa.ebli.geometrie.GrPolyligne; +import org.fudaa.ebli.ressource.EbliResource; + +import com.memoire.bu.BuButton; +import com.memoire.bu.BuGridLayout; +import com.memoire.bu.BuLabel; +import com.memoire.bu.BuPanel; +import com.memoire.bu.BuResource; +import com.memoire.bu.BuScrollPane; +import com.memoire.bu.BuTable; +import com.memoire.bu.BuTextField; +import com.memoire.bu.BuVerticalLayout; +import com.memoire.fu.Fu; +import com.memoire.fu.FuLog; + +/** + * Un panneau d'\xE9dition d'une ligne bris\xE9e qui s'affiche lorsque l'outil ligne bris\xE9e est s\xE9lectionn\xE9. + * Ce panneau est inclu dans le panneau des outils. + * + * @author Fred Deniger + * @version $Id: ZEditorLigneBriseePanel.java,v 1.21.4.3 2008-03-26 16:46:43 bmarchan Exp $ + */ +public class ZEditorLigneBriseePanel extends BuPanel implements ZEditionAttributesCreatorInterface, ZEditorPanelInterface, ActionListener { + + protected class ValueModel extends AbstractTableModel { + + GISAttributeInterface[] atomicAttr_; + + protected ValueModel() { + updateAtomicArrays(); + } + + protected void updateAtomic() { + super.fireTableDataChanged(); + } + + protected final void updateAtomicArrays() { + if (editorComps_ != null && editorAttribute_ != null && editorAttribute_.size() > 0) { + final List r = new ArrayList(editorAttribute_.size()); + for (final Iterator it = editorAttribute_.keySet().iterator(); it.hasNext();) { + final GISAttributeInterface att = (GISAttributeInterface) it.next(); + if (att.isAtomicValue()) { + r.add(att); + } + } + atomicAttr_ = new GISAttributeInterface[r.size()]; + r.toArray(atomicAttr_); + } + } + + public Class getColumnClass(final int _columnIndex) { + if (_columnIndex > 2) { + return atomicAttr_[_columnIndex - 3].getDataClass(); + } + return Double.class; + } + + public int getColumnCount() { + return 3 + (atomicAttr_ == null ? 0 : atomicAttr_.length); + } + + public String getColumnName(final int _column) { + if (_column == 0) { + return CtuluLibString.ESPACE; + } + if (_column == 1) { + return "X"; + } + if (_column == 2) { + return "Y"; + } + final int idxFeature = _column - 3; + if (atomicAttr_ != null) { + return atomicAttr_[idxFeature].getName(); + } + return super.getColumnName(_column); + } + + public int getRowCount() { + final ZCalqueEditionInteraction.FormDelegate forme = edition_.getFormeEnCours(); + if (!forme.enCours()) { + return 0; + } + if (forme.getForme() == DeForme.RECTANGLE) { + return 1; + } + return forme.enCours() ? ((GrPolyligne) forme.getFormeEnCours()).nombre() : 0; + } + + public Object getValueAt(final int _rowIndex, final int _columnIndex) { + if (_columnIndex == 0) { + return CtuluLibString.getString(_rowIndex + 1); + } + final ZCalqueEditionInteraction.FormDelegate forme = edition_.getFormeEnCours(); + if (!forme.enCours()) { + return CtuluLibString.EMPTY_STRING; + } + final boolean isRect = forme.getForme() == DeForme.RECTANGLE; + GrPolyligne o = null; + GrPoint init = null; + if (isRect) { + init = (GrPoint) forme.getFormeEnCours(); + } else { + o = (GrPolyligne) forme.getFormeEnCours(); + } + if (o != null) { + if (_columnIndex == 1) { + if (init == null) { + return formatter_.getXYFormatter().format(o.sommets_.renvoieX(_rowIndex)); + } + formatter_.getXYFormatter().format(init.x_); + } else if (_columnIndex == 2) { + if (init == null) { + return formatter_.getXYFormatter().format(o.sommets_.renvoieY(_rowIndex)); + } + formatter_.getXYFormatter().format(init.y_); + } else if (atomicAttr_ != null) { + final int featureIdx = _columnIndex - 3; + if (featureIdx >= 0 && attributes_ != null && attributes_.length > 0) { + return forme.getData().getValue(atomicAttr_[featureIdx], _rowIndex); + } + + } + } + return null; + } + + public boolean isCellEditable(final int _rowIndex, final int _columnIndex) { + return _columnIndex > 0; + } + + public void setValueAt(final Object _value, final int _rowIndex, final int _columnIndex) { + if (_value == null) return; + final ZCalqueEditionInteraction.FormDelegate forme = edition_.getFormeEnCours(); + final boolean isRect = forme.getForme() == DeForme.RECTANGLE; + GrPolyligne o = null; + GrPoint init = null; + if (isRect) { + init = (GrPoint) forme.getFormeEnCours(); + } else { + o = (GrPolyligne) forme.getFormeEnCours(); + } + if (o != null && o.sommets_ != null) { + if (_columnIndex == 1) { + if (init == null) { + o.sommets_.setX(Double.parseDouble(_value.toString()), _rowIndex); + } else { + init.x_ = Double.parseDouble(_value.toString()); + } + edition_.repaint(); + + } else if (_columnIndex == 2) { + if (init == null) { + o.sommets_.setY(Double.parseDouble(_value.toString()), _rowIndex); + } else { + init.y_ = Double.parseDouble(_value.toString()); + + } + edition_.repaint(); + + } else if (atomicAttr_ != null) { + forme.getData().setValue(atomicAttr_[_columnIndex - 3], _rowIndex, _value); + } + } + super.fireTableDataChanged(); + } + + } + + /** + * Interface graphique permettant de g\xE9rer les propri\xE9t\xE9s de l'ellipse lors de + * sa construction + * + * @author Emmanuel Martin + */ + protected class EllipseBuilderGUI extends BuPanel implements ActionListener { + + private BuTextField tfCoordX_; + private BuTextField tfCoordY_; + private BuTextField tfRayonX_; + private BuTextField tfRayonY_; + private BuTextField tfNbPoints_; + private String nbPointsDefaultValue_; + + public EllipseBuilderGUI() { + super(); + int hauteur=20; + in... [truncated message content] |
From: <de...@us...> - 2008-09-14 20:51:48
|
Revision: 3924 http://fudaa.svn.sourceforge.net/fudaa/?rev=3924&view=rev Author: deniger Date: 2008-09-14 20:51:52 +0000 (Sun, 14 Sep 2008) Log Message: ----------- ajout de l'action grouper Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluDialogPanel.java branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluLibSwing.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliLookFeel.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliSceneController.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerActionOnly.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerMenuOnly.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreator.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorDblFleche.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorFleche.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorImage.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorShape.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorTextEditor.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorTextLabel.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGroupCreator.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetImage.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetSynchroniser.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextLabel.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetGroupAction.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/WidgetConfigure.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/CalqueLegendeWidgetAdapter.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCalqueLegende.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetControllerCalque.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorLegende.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetCreatorVueCalque.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/calque/EbliWidgetVueCalque.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetControllerGraphe.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetCreatorGraphe.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetCreatorLegende.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/EbliWidgetGraphe.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/graphe/WidgetLegendeManager.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/tree/EbliWidgetTreeTableNode.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionChangeSceneForWidget.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionFusionGraphes.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutPanelController.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostProjet.java Added Paths: ----------- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/formatgroup_16.png branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/formatungroup_16.png branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerForGroup.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetWithBordure.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetUngroupAction.java Removed Paths: ------------- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordure.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/EbliWidgetDegroupAction.java Modified: branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluDialogPanel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluDialogPanel.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluDialogPanel.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -175,6 +175,12 @@ return addLongText(this, _d); } + protected JComboBox addComboBox(Object[] _values, Container _c) { + JComboBox cb = new BuComboBox(_values);; + _c.add(cb); + return cb; + } + /** * ajoute au panel un label dont la couleur de texte est rouge. */ @@ -416,13 +422,9 @@ public static CtuluDialog createDialog(final Component _parent, final CtuluDialogPanel _panel) { if (_parent instanceof JDialog) { return new CtuluDialog((JDialog) _parent, _panel); - } else if (_parent instanceof JFrame) { - return new CtuluDialog((JFrame) _parent, _panel); - } + } else if (_parent instanceof JFrame) { return new CtuluDialog((JFrame) _parent, _panel); } final BuApplication app = (BuApplication) SwingUtilities.getAncestorOfClass(BuApplication.class, _parent); - if (app != null) { - return new CtuluDialog(app, _panel); - } + if (app != null) { return new CtuluDialog(app, _panel); } return new CtuluDialog(_panel); } @@ -529,9 +531,7 @@ } public void setErrorText(final String _error) { - if (lbError_ == null) { - return; - } + if (lbError_ == null) { return; } lbError_.setVisible(true); lbError_.setText(_error); lbError_.revalidate(); Modified: branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluLibSwing.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluLibSwing.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ctulu/src/org/fudaa/ctulu/gui/CtuluLibSwing.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -22,6 +22,7 @@ import javax.swing.BorderFactory; import javax.swing.Icon; import javax.swing.JCheckBox; +import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JFrame; @@ -37,8 +38,10 @@ import com.memoire.bu.BuApplication; import com.memoire.bu.BuBorders; import com.memoire.bu.BuCheckBox; +import com.memoire.bu.BuGridLayout; import com.memoire.bu.BuLib; import com.memoire.bu.BuList; +import com.memoire.bu.BuVerticalLayout; /** * @author fred deniger @@ -214,6 +217,27 @@ return createTitleBorder(_title, BuBorders.EMPTY2222); } + /** + * @param _values les valeurs parmi lesquelles on veut choisir + * @param _parent le composant parent + * @param _title le titre du dialog + * @param _lb le label + * @param _vert true si on veut que le label est le com soit place verticalement + * @return l'indice de l'objet s\xE9lectionne au -1 si l'utilisateur a refuse + */ + public static int chooseValue(Object[] _values, Component _parent, String _title, String _lb, boolean _vert) { + CtuluDialogPanel pn = new CtuluDialogPanel(); + if (_vert) { + pn.setLayout(new BuVerticalLayout(5)); + } else { + pn.setLayout(new BuGridLayout(2)); + } + pn.addLabel(_lb); + JComboBox res = pn.addComboBox(_values, pn); + if (pn.afficheModaleOk(_parent, _title)) { return res.getSelectedIndex(); } + return -1; + } + public static Border createTitleBorder(final String _title, final Border _inBorder) { return BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(_title), _inBorder); } Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/formatgroup_16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/ressource/formatungroup_16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliLookFeel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliLookFeel.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliLookFeel.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -18,7 +18,11 @@ private static final Border RESIZE_BORDER = BorderFactory.createResizeBorder(MINI_THICKNESS, COLOR_HOVERED, true); private static final Border RESIZE_BORDER_SELECTED = BorderFactory.createCompositeBorder(BorderFactory .createRoundedBorder(0, 0, 0, 0, COLOR_SELECTED, COLOR_HOVERED), RESIZE_BORDER); - private static final Border DEFAULT_BORDER = BorderFactory.createEmptyBorder(8); + private static final Border DEFAULT_BORDER = BorderFactory.createEmptyBorder(MINI_THICKNESS); + private static final Border NON_RESIZE_BORDER_SELECTED = BorderFactory.createCompositeBorder(BorderFactory + .createRoundedBorder(0, 0, 0, 0, COLOR_SELECTED, COLOR_HOVERED), DEFAULT_BORDER); + private static final Border NON_RESIZE_BORDER = BorderFactory.createRoundedBorder(MINI_THICKNESS, MINI_THICKNESS, + MINI_THICKNESS, MINI_THICKNESS, null, COLOR_SELECTED.darker()); public Border getBorder(ObjectState _state) { return getBorder(_state, true); @@ -27,18 +31,14 @@ public Border getBorder(ObjectState _state, boolean resizable) { if (resizable) { if (_state.isHovered()) { - if (_state.isSelected()) { - return RESIZE_BORDER_SELECTED; - } + if (_state.isSelected()) { return RESIZE_BORDER_SELECTED; } return RESIZE_BORDER; } - if (_state.isSelected()) { - return MINI_BORDER_SELECTED; - } + if (_state.isSelected()) { return MINI_BORDER_SELECTED; } } else { - // a continuer pour le cas non retaillable - + if (_state.isSelected()) return NON_RESIZE_BORDER_SELECTED; + else if (_state.isHovered()) return NON_RESIZE_BORDER; } return DEFAULT_BORDER; Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliSceneController.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliSceneController.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliSceneController.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -182,6 +182,10 @@ return alignWithMoveAction; } + public WidgetAction getReisizeAction() { + return alignWithResizeAction; + } + /** * @return the rectangularSelection */ Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidget.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -7,8 +7,7 @@ import java.util.HashMap; import java.util.Map; -import javax.swing.JComponent; - +import org.fudaa.ctulu.CtuluCommandContainer; import org.fudaa.ctulu.CtuluLibString; import org.fudaa.ebli.commun.EbliLib; import org.fudaa.ebli.controle.BConfigurableComposite; @@ -186,13 +185,8 @@ // -- cas particulier si il s agit de la rotation --// // -- il faut transformer les degres en radian --// - if (_key.equals(ROTATION)) { + if (_key.equals(ROTATION)) { return Integer.valueOf((int) Math.toDegrees(getRotation())); } - double radian = getRotation(); - return Integer.valueOf((int) (radian * 180 / Math.PI)); - - } - return propGraphique.get(_key); } @@ -264,8 +258,7 @@ @Override public void notifyStateChanged(ObjectState previousState, ObjectState newState) { if (!useBorder_) { return; } - setBorder(getScene().getLookFeel().getBorder(newState)); - // TODO a verifier pour le rendu + setBorder(((EbliLookFeel) getScene().getLookFeel()).getBorder(newState, getController().canResize_)); EbliWidget parent = getGroup(); if (newState.isHovered() && parent != null) { parent.setBorder(getBorder()); @@ -275,7 +268,7 @@ /** * Methode qui raffraichis les proprietes de la widget. */ - public void refreshMyProperties() { + public final void refreshMyProperties() { getEbliScene().refresh(); } @@ -289,8 +282,9 @@ propGraphique.put(COLORFOND, newColor); } - public void setController_(EbliWidgetController controller_) { + public void setController(EbliWidgetController controller_) { this.controller_ = controller_; + } public void setFormeFont(Font newFont) { @@ -308,49 +302,47 @@ * Methode directement appelee apres modification des parametres renvoye par le getproperty. Ajoute les anciens * parametres dans la commande undo/redo. */ - public boolean setProperty(String _key, Object prop) { + public final boolean setProperty(String _key, Object prop) { // --cas particulier si il s agit du tracelignemodel: il faut mettre a jour // l ancien lignemodel --// + setPropertyCmd(_key, prop, getEbliScene().getCmdMng()); + + return true; + } + + protected void setPropertyCmd(String _key, Object prop, CtuluCommandContainer _cmd) { + CommandeUndoRedoGraphicalProperties undoRedo = null; + if (_cmd != null) { + undoRedo = new CommandeUndoRedoGraphicalProperties(); + // -- ajout de la widget en question ainsi que la oldpropertie --// + undoRedo.addWidget(this); + // inutile de tout dupliquer + undoRedo.addOldPropertie(this.duplicateGraphicalProperties()); + _cmd.addCmd(undoRedo); + } if (_key.equals(LINEMODEL)) { getTraceLigneModel().updateData((TraceLigneModel) prop); prop = getTraceLigneModel(); } else if (_key.equals(ROTATION) && prop instanceof Integer) { - // -- cas particulier si il s agit de la rotation --// - // -- il faut transformer les degres en radian --// - int degre = ((Integer) prop).intValue(); - double radian = degre * Math.PI / 180; - prop = new Double(radian); - + prop = new Double(Math.toRadians(((Integer) prop).intValue())); } - // -- creation de la commande undo/redo --// - CommandeUndoRedoGraphicalProperties undoRedo = new CommandeUndoRedoGraphicalProperties(); - - // -- ajout de la widget en question ainsi que la oldpropertie --// - undoRedo.addWidget(this); - undoRedo.addOldPropertie(this.duplicateGraphicalProperties()); - // --mise a jout de la map de proprietes --// propGraphique.put(_key, prop); - - // -- ajout de la nouvelle propertie --// - undoRedo.addNewPropertie(propGraphique); - - // -- enregistrement de la commande undo/redo --// - if (getEbliScene().getCmdMng() != null) { - getEbliScene().getCmdMng().addCmd(undoRedo); + if (undoRedo != null) { + // -- ajout de la nouvelle propertie --// + undoRedo.addNewPropertie(propGraphique); } // -- mise a jour des parametres de la map --// refreshMyProperties(); - - return true; } - public void setPropGraphique(Map<String, Object> propGraphique) { - this.propGraphique = propGraphique; - + public final void setPropGraphique(Map<String, Object> propGraphique) { + for (Map.Entry<String, Object> it : propGraphique.entrySet()) { + setPropertyCmd(it.getKey(), it.getValue(), null); + } } public void setRotation(double rotation) { Deleted: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordure.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordure.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordure.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -1,219 +0,0 @@ -package org.fudaa.ebli.visuallibrary; - -import java.awt.Color; -import java.awt.Font; -import java.awt.Graphics2D; -import java.awt.Insets; -import java.awt.Rectangle; -import java.util.HashMap; -import java.util.Map; - -import org.fudaa.ebli.trace.TraceLigne; -import org.fudaa.ebli.trace.TraceLigneModel; -import org.fudaa.ebli.visuallibrary.actions.CommandeUndoRedoGraphicalProperties; -import org.fudaa.ebli.visuallibrary.layout.OverlayLayoutGap; - -/** - * classe qui genere une bordure pour contenir une widget classique. - * - * @author genesis - */ -public class EbliWidgetBordure extends EbliWidget { - - /** - * Widget contenu en intern dans la widget bordure - */ - EbliWidget intern_; - - /** - * Retourne le controlleur de son objet contenu. Le controlleur de la bordure n'a pas besoin d'etre recup\xE9r\xE9. - */ - @Override - public EbliWidgetController getController() { - return getIntern().getController(); - } - - public float epaisseurHisto_ = 0; - private Insets insets_; - - /** - * constructeur qui gere un controller uniquement pour les actions. - * - * @param scene - */ - public EbliWidgetBordure(EbliWidget _intern) { - this(_intern, true, true); - } - - @Override - public boolean isInEditMode() { - return intern_.isInEditMode_; - } - - public EbliWidgetBordure(EbliWidget _intern, boolean canMove, boolean canResize) { - super(_intern.getEbliScene(), false); - - intern_ = _intern; - - insets_ = createInset((int) getTraceLigneModel().getEpaisseur()); - setLayout(new OverlayLayoutGap(insets_)); - - // -- ajout du child --// - addChild(intern_); - - // --ajout du controller specifique au bordure --// - this.setController_(new EbliWidgetControllerActionOnly(this, canMove, canResize)); - } - - public Insets createInset(int epaisseur) { - - return new Insets(epaisseur, epaisseur, epaisseur, epaisseur); - } - - protected void paintWidget() { - - // -- mise a jour de la fonte que si il y a eu une modification --// - - Graphics2D g = getGraphics(); - - Rectangle rec = getClientArea(); - - if (epaisseurHisto_ != getTraceLigneModel().getEpaisseur()) { - insets_.bottom = (int) getTraceLigneModel().getEpaisseur(); - insets_.top = insets_.bottom; - insets_.left = insets_.bottom; - insets_.right = insets_.bottom; - Rectangle newBounds = getBounds(); - newBounds.height += (getTraceLigneModel().getEpaisseur() - epaisseurHisto_) * 2; - newBounds.width += (getTraceLigneModel().getEpaisseur() - epaisseurHisto_) * 2; - setPreferredBounds(newBounds); - } - // -- couleur de fond --// - // g.setColor(getColorFond()); - // g.fillRect(0, 0, rec.width, rec.height); - - g.translate(rec.x, rec.y); - // la ligne - - TraceLigne l = new TraceLigne(getTraceLigneModel()); - - l.setCouleur(getColorContour()); - l.dessineRectangle(g, (int) (l.getEpaisseur() / 2), (int) (l.getEpaisseur() / 2), (int) (rec.width - l - .getEpaisseur()), (int) (rec.height - l.getEpaisseur())/* , rec.width */); - - g.translate(-rec.x, -rec.y); - - epaisseurHisto_ = getTraceLigneModel().getEpaisseur(); - - } - - /** - * surcharge des methodes getProperty pour recuperer les proprietes graphiques et les dipatcher a son conteneur - */ - public Object getProperty(String _key) { - - // -- la bordure ne gere que tracemodel et couleur contour, le reste est - // dispatch\xE9 a son conteneur --// - if (_key.equals(ROTATION)) { - - double radian = intern_.getRotation(); - return Integer.valueOf((int) (radian * 180 / Math.PI)); - - } else if (_key.equals(FONT)) { - return intern_.propGraphique.get(_key); - } else if (_key.equals(COLORFOND)) { - return intern_.propGraphique.get(_key); - } else return propGraphique.get(_key); - } - - /** - * Methode directement appelee apres modification des parametres renvoye par le getproperty. Ajoute les anciens - * parametres dans la commande undo/redo. - */ - public boolean setProperty(String _key, Object prop) { - if (_key.equals(FONT) || _key.equals(COLORFOND)) { return intern_.setProperty(_key, prop); } - - // --cas particulier si il s agit du tracelignemodel: il faut mettre a jour - // l ancien lignemodel --// - if (_key.equals(LINEMODEL)) { - getTraceLigneModel().updateData((TraceLigneModel) prop); - prop = getTraceLigneModel(); - } else if (_key.equals(ROTATION) && prop instanceof Integer) { - // -- cas particulier si il s agit de la rotation --// - // -- il faut transformer les degres en radian --// - int degre = ((Integer) prop).intValue(); - double radian = degre * Math.PI / 180; - prop = new Double(radian); - - } - - // -- creation de la commande undo/redo --// - CommandeUndoRedoGraphicalProperties undoRedo = new CommandeUndoRedoGraphicalProperties(); - - // -- ajout de la widget en question ainsi que la oldpropertie --// - undoRedo.addWidget(this); - - // --mise a jout de la map de proprietes --// - if (_key.equals(LINEMODEL) || _key.equals(COLORCONTOUR)) { - undoRedo.addOldPropertie(this.duplicateGraphicalProperties()); - propGraphique.put(_key, prop); - // -- ajout de la nouvelle propertie --// - undoRedo.addNewPropertie(propGraphique); - } else { - undoRedo.addOldPropertie(intern_.duplicateGraphicalProperties()); - intern_.propGraphique.put(_key, prop); - // -- ajout de la nouvelle propertie --// - undoRedo.addNewPropertie(intern_.propGraphique); - } - - // -- enregistrement de la commande undo/redo --// - if (getEbliScene().getCmdMng() != null) { - getEbliScene().getCmdMng().addCmd(undoRedo); - } - - // -- mise a jour des parametres de la map --// - refreshMyProperties(); - - return true; - } - - /** - * surcharge des getter et setter graphical properties pour rediriger les infos vers les widgets contenu - */ - public Map<String, Object> getPropGraphique() { - - Map<String, Object> mapMeltingPot = new HashMap<String, Object>(); - mapMeltingPot.put(COLORCONTOUR, getColorContour()); - mapMeltingPot.put(LINEMODEL, getTraceLigneModel()); - - // -- les autres valeurs conernent le contenu --// - mapMeltingPot.put(ROTATION, intern_.getRotation()); - mapMeltingPot.put(FONT, intern_.getFormeFont()); - mapMeltingPot.put(COLORFOND, intern_.getColorFond()); - - return mapMeltingPot; - } - - /** - * surcharge des getter et setter graphical properties pour rediriger les infos vers les widgets contenu - */ - public void setPropGraphique(Map<String, Object> propGraphique) { - this.propGraphique.put(COLORCONTOUR, propGraphique.get(COLORCONTOUR)); - this.propGraphique.put(LINEMODEL, propGraphique.get(LINEMODEL)); - - // -- on redirige les proprietes font,couleur de fond et rotation --// - this.intern_.setFormeFont((Font) propGraphique.get(FONT)); - this.intern_.setColorFond((Color) propGraphique.get(COLORFOND)); - this.intern_.setRotation((Double) propGraphique.get(ROTATION)); - - } - - public EbliWidget getIntern() { - return intern_; - } - - public void setIntern(EbliWidget _intern) { - intern_ = _intern; - } - -} Copied: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java (from rev 3910, branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordure.java) =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java (rev 0) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -0,0 +1,131 @@ +package org.fudaa.ebli.visuallibrary; + +import java.awt.Insets; +import java.util.HashMap; +import java.util.Map; + +import org.fudaa.ctulu.CtuluCommandContainer; +import org.fudaa.ebli.visuallibrary.layout.OverlayLayoutGap; + +/** + * classe qui genere une bordure pour contenir une widget classique. + * + * @author genesis + */ +public class EbliWidgetBordureSingle extends EbliWidgetWithBordure { + + /** + * Widget contenu en intern dans la widget bordure + */ + EbliWidget intern_; + + /** + * Retourne le controlleur de son objet contenu. Le controlleur de la bordure n'a pas besoin d'etre recup\xE9r\xE9. + */ + @Override + public EbliWidgetController getController() { + return getIntern().getController(); + } + + /** + * constructeur qui gere un controller uniquement pour les actions. + * + * @param scene + */ + public EbliWidgetBordureSingle(EbliWidget _intern) { + this(_intern, true, true); + } + + @Override + public boolean isInEditMode() { + return intern_.isInEditMode_; + } + + public EbliWidgetBordureSingle(EbliWidget _intern, boolean canMove, boolean canResize) { + super(_intern.getEbliScene(), false); + + intern_ = _intern; + + insets_ = createInset((int) getTraceLigneModel().getEpaisseur()); + setLayout(new OverlayLayoutGap(insets_)); + + // -- ajout du child --// + addChild(intern_); + + // --ajout du controller specifique au bordure --// + this.setController(new EbliWidgetControllerActionOnly(this, canMove, canResize)); + } + + public Insets createInset(int epaisseur) { + + return new Insets(epaisseur, epaisseur, epaisseur, epaisseur); + } + + /** + * surcharge des methodes getProperty pour recuperer les proprietes graphiques et les dipatcher a son conteneur + */ + public Object getProperty(String _key) { + + // -- la bordure ne gere que tracemodel et couleur contour, le reste est + // dispatch\xE9 a son conteneur --// + if (_key.equals(ROTATION)) { + + double radian = intern_.getRotation(); + return Integer.valueOf((int) (radian * 180 / Math.PI)); + + } else if (_key.equals(FONT)) { + return intern_.propGraphique.get(_key); + } else if (_key.equals(COLORFOND)) { + return intern_.propGraphique.get(_key); + } else return propGraphique.get(_key); + } + + @Override + protected void setPropertyCmd(String _key, Object _prop, CtuluCommandContainer _cmd) { + if (_key.equals(LINEMODEL) || _key.equals(COLORCONTOUR)) { + super.setPropertyCmd(_key, _prop, _cmd); + } else { + intern_.setPropertyCmd(_key, _prop, _cmd); + } + } + + /** + * surcharge des getter et setter graphical properties pour rediriger les infos vers les widgets contenu + */ + public Map<String, Object> getPropGraphique() { + + Map<String, Object> mapMeltingPot = new HashMap<String, Object>(); + mapMeltingPot.put(COLORCONTOUR, getColorContour()); + mapMeltingPot.put(LINEMODEL, getTraceLigneModel()); + + // -- les autres valeurs conernent le contenu --// + mapMeltingPot.put(ROTATION, intern_.getRotation()); + mapMeltingPot.put(FONT, intern_.getFormeFont()); + mapMeltingPot.put(COLORFOND, intern_.getColorFond()); + + return mapMeltingPot; + } + + // /** + // * surcharge des getter et setter graphical properties pour rediriger les infos vers les widgets contenu + // */ + // public void setPropGraphique(Map<String, Object> propGraphique) { + // this.propGraphique.put(COLORCONTOUR, propGraphique.get(COLORCONTOUR)); + // this.propGraphique.put(LINEMODEL, propGraphique.get(LINEMODEL)); + // + // // -- on redirige les proprietes font,couleur de fond et rotation --// + // this.intern_.setFormeFont((Font) propGraphique.get(FONT)); + // this.intern_.setColorFond((Color) propGraphique.get(COLORFOND)); + // this.intern_.setRotation((Double) propGraphique.get(ROTATION)); + // + // } + + public EbliWidget getIntern() { + return intern_; + } + + public void setIntern(EbliWidget _intern) { + intern_ = _intern; + } + +} Property changes on: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetBordureSingle.java ___________________________________________________________________ Added: svn:mergeinfo + Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -37,26 +37,30 @@ */ public class EbliWidgetController { - protected boolean canDuplicate_ = true; - protected boolean canMove_ = true; - protected boolean canResize_ = true; - private String description_; - protected EbliWidget widget_; - /** * action de la widget recuperable et eventuellement supprimable */ WidgetAction actionMove_; WidgetAction actionResize_; WidgetAction actionSelect_; + protected boolean canDuplicate_ = true; + protected boolean canMove_ = true; + protected boolean canResize_ = true; + private String description_; + private JPopupMenu popupMenu_; + + protected PopupMenuProvider providerPopup_ = null; + + protected EbliWidget widget_; + public EbliWidgetController(EbliWidget widget_) { this(widget_, true, true, true); } - public EbliWidgetController(EbliWidget widget_, boolean canMove, boolean canResize) { - this(widget_, canMove, canResize, true); + public EbliWidgetController(EbliWidget _widget, boolean _canMove, boolean _canResize) { + this(_widget, _canMove, _canResize, true); } public EbliWidgetController(EbliWidget widget_, boolean canMove, boolean canResize, boolean canDuplicate) { @@ -67,70 +71,54 @@ canResize_ = canResize; // creation des actions par defaut - createdefaultAction(); + createDefaultAction(); + initMenu(); - // menu intern propre a la widget - setMenu(); - } - public boolean isCanDuplicate() { - return canDuplicate_; - } + public void addFonctionsSpecific(ArrayList<EbliActionSimple> _listeActions) { - public boolean isCanMove() { - return canMove_; } - public boolean isCanResize() { - return canResize_; - } + protected void constructMenuDupliquer(JPopupMenu _popup, final CtuluCommandContainer cmd_) { + JMenuItem menuItem1 = _popup.add("Dupliquer l'objet"); + menuItem1.setIcon(CtuluResource.CTULU.getIcon("crystal_cascade")); + menuItem1.addActionListener(new ActionListener() { - /** - * methode qui cree les actions par defaut pour la widget. - */ - public void createdefaultAction() { - // -- construction des actions --// - actionSelect_ = widget_.getEbliScene().createSelectAction(); - widget_.getActions().addAction(actionSelect_); + public void actionPerformed(ActionEvent e) { - actionResize_ = ActionFactory.createResizeAction(); - if (canResize_) widget_.getActions().addAction(actionResize_); + // -- recuperation du node a dupliquer --// + EbliNode n = (EbliNode) widget_.getEbliScene().findObject(widget_); - widget_.getActions().addAction(widget_.getEbliScene().createWidgetHoverAction()); + // duplication du node en question + EbliNode duplique = n.duplicate(null); - actionMove_ = widget_.getEbliScene().getController().getMoveAction(); - if (canMove_) widget_.getActions().addAction(actionMove_); - } + // nouvelle position a cote de son predecesseur + // duplique.setPreferedLocation(nouvellePosition); - /** - * Methode appelee pour bloquer une widget: l'empecher de se deplacer. - */ - public void removeActionResizeAndMove() { - widget_.getActions().removeAction(actionMove_); - widget_.getActions().removeAction(actionSelect_); + // -- ajout dans la scene --// + if (duplique != null && widget_.getScene() != null) { + widget_.getEbliScene().addNode(duplique); - } + // -- duplication des map de property graphique de la widget --// + duplique.getWidget().propGraphique = n.getWidget().duplicateGraphicalProperties(); + // -- duplication de la taille --// + duplique.getWidget().setPreferredBounds(n.getWidget().getPreferredBounds()); - /** - * fonction inverse de la precedente. - */ - public void replaceActionResizeAndMove() { + // -- ajout de la commande undo/redo --// + ArrayList<EbliNode> ln = new ArrayList<EbliNode>(); + ln.add(duplique); + cmd_.addCmd(new CommandeDuplicate(ln, widget_.getEbliScene())); - widget_.getActions().addAction(actionMove_); - widget_.getActions().addAction(actionSelect_); + // -- raffraichissement de la scene --// + widget_.getEbliScene().refresh(); + } - } + } - public String getDescription() { - return description_; + }); } - public void setDescription(String description_) { - this.description_ = description_; - widget_.setToolTipText(description_); - } - protected void constructMenuMasquer(JPopupMenu _popup, final CtuluCommandContainer cmd_) { JMenuItem menuItem = _popup.add("Masquer l'objet"); menuItem.setIcon(CtuluResource.CTULU.getIcon("crystal_visibilite")); @@ -181,45 +169,6 @@ }); } - protected void constructMenuDupliquer(JPopupMenu _popup, final CtuluCommandContainer cmd_) { - JMenuItem menuItem1 = _popup.add("Dupliquer l'objet"); - menuItem1.setIcon(CtuluResource.CTULU.getIcon("crystal_cascade")); - menuItem1.addActionListener(new ActionListener() { - - public void actionPerformed(ActionEvent e) { - - // -- recuperation du node a dupliquer --// - EbliNode n = (EbliNode) widget_.getEbliScene().findObject(widget_); - - // duplication du node en question - EbliNode duplique = n.duplicate(null); - - // nouvelle position a cote de son predecesseur - // duplique.setPreferedLocation(nouvellePosition); - - // -- ajout dans la scene --// - if (duplique != null && widget_.getScene() != null) { - widget_.getEbliScene().addNode(duplique); - - // -- duplication des map de property graphique de la widget --// - duplique.getWidget().propGraphique = n.getWidget().duplicateGraphicalProperties(); - // -- duplication de la taille --// - duplique.getWidget().setPreferredBounds(n.getWidget().getPreferredBounds()); - - // -- ajout de la commande undo/redo --// - ArrayList<EbliNode> ln = new ArrayList<EbliNode>(); - ln.add(duplique); - cmd_.addCmd(new CommandeDuplicate(ln, widget_.getEbliScene())); - - // -- raffraichissement de la scene --// - widget_.getEbliScene().refresh(); - } - - } - - }); - } - /** * Methode de construction des menus de base * @@ -251,36 +200,7 @@ } - protected PopupMenuProvider providerPopup_ = null; - protected JPopupMenu popupMenu_ = null; - - public JPopupMenu getPopup() { - return popupMenu_; - } - /** - * Methode generique qui fait apparaitre un menuItem propre au composant et offre les op\xE9rations de base on ouvre le - * menu via le clic droit ou le raccourcis shift+F10 - */ - - public void setMenu() { - - popupMenu_ = new JPopupMenu(); - - // -- construction du menu pour les graphismees --// - constructPopupMenuBaseGraphique(popupMenu_); - // -- creation du menu commun a tous les widgets - constructPopupMenuBase(popupMenu_); - - providerPopup_ = new PopupMenuProvider() { - public JPopupMenu getPopupMenu(Widget widget, Point localLocation) { - return popupMenu_; - } - }; - widget_.getActions().addAction(ActionFactory.createPopupMenuAction(providerPopup_)); - } - - /** * Attention ce menu ne doit pas apparaitre pour les calques et graphe car il n a aucun effet. * * @param _popup @@ -296,11 +216,10 @@ EbliWidget found = null;// widget_; - if (widget_.getParentWidget() != null && widget_.getParentWidget() instanceof EbliWidgetBordure) - found = (EbliWidget) widget_.getParentWidget(); - else - found = widget_; - + if (widget_.getParentWidget() != null && widget_.getParentWidget() instanceof EbliWidgetBordureSingle) found = (EbliWidget) widget_ + .getParentWidget(); + else found = widget_; + BConfigurePalette palette = new BConfigurePalette(false); BConfigurableComposite cmp = WidgetConfigure.configurePalette(found); @@ -319,42 +238,138 @@ }); } - public EbliWidget getWidget() { - return widget_; + /** + * methode qui cree les actions par defaut pour la widget. + */ + public void createDefaultAction() { + // -- construction des actions --// + actionSelect_ = widget_.getEbliScene().createSelectAction(); + widget_.getActions().addAction(actionSelect_); + + actionResize_ = widget_.getEbliScene().getController().getReisizeAction(); + if (canResize_) widget_.getActions().addAction(actionResize_); + + widget_.getActions().addAction(widget_.getEbliScene().createWidgetHoverAction()); + + actionMove_ = widget_.getEbliScene().getController().getMoveAction(); + if (canMove_) widget_.getActions().addAction(actionMove_); } - public void setWidget(EbliWidget widget_) { - this.widget_ = widget_; - }; + public boolean fonctionsAlreadySpecified() { + return false; + } - - public JComponent getOverviewComponent() { - - - - return null; + public String getDescription() { + return description_; } - - public BuToolBar getToolbarComponent() { + + public BuMenuBar getMenubarComponent() { return null; } - - public BuMenuBar getMenubarComponent() { + + public JComponent getOverviewComponent() { + return null; } - public void addFonctionsSpecific(ArrayList<EbliActionSimple> _listeActions) { + public JPopupMenu getPopup() { + createPopup(); + return popupMenu_; } - - public boolean fonctionsAlreadySpecified() { - return false; + + public BuToolBar getToolbarComponent() { + return null; } - public JComponent geTtracableComponent() { return new JLabel(); } - - + + public EbliWidget getWidget() { + return widget_; + } + + /** + * Methode generique qui fait apparaitre un menuItem propre au composant et offre les op\xE9rations de base on ouvre le + * menu via le clic droit ou le raccourcis shift+F10 + */ + protected final void initMenu() { + if (!isMenuAllowed()) return; + providerPopup_ = new PopupMenuProvider() { + public JPopupMenu getPopupMenu(Widget widget, Point localLocation) { + createPopup(); + return popupMenu_; + } + + }; + widget_.getActions().addAction(ActionFactory.createPopupMenuAction(providerPopup_)); + } + + void createPopup() { + if (popupMenu_ == null) { + popupMenu_ = new JPopupMenu(); + buildPopupMenu(popupMenu_); + } + } + + /** + * @return true par defaut: le popup menu sera cree + */ + protected boolean isMenuAllowed() { + return true; + } + + protected void buildPopupMenu(JPopupMenu _menu) { + // -- construction du menu pour les graphismees --// + constructPopupMenuBaseGraphique(_menu); + // -- creation du menu commun a tous les widgets + constructPopupMenuBase(_menu); + } + + public boolean isCanDuplicate() { + return canDuplicate_; + }; + + public boolean isCanMove() { + return canMove_; + } + + public boolean isCanResize() { + return canResize_; + } + + /** + * Methode appelee pour bloquer une widget: l'empecher de se deplacer. + */ + public void removeActionResizeAndMove() { + widget_.getActions().removeAction(actionMove_); + widget_.getActions().removeAction(actionResize_); + canMove_ = false; + canResize_ = false; + + } + + /** + * fonction inverse de la precedente. + */ + public void replaceActionResizeAndMove() { + if(actionMove_!=null) + widget_.getActions().addAction(actionMove_); + if(actionResize_!=null) + widget_.getActions().addAction(actionResize_); + canMove_ = true; + canResize_ = true; + + } + + public void setDescription(String description_) { + this.description_ = description_; + widget_.setToolTipText(description_); + } + + public void setWidget(EbliWidget widget_) { + this.widget_ = widget_; + } + } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerActionOnly.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerActionOnly.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerActionOnly.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -17,13 +17,11 @@ public EbliWidgetControllerActionOnly(EbliWidget widget_, boolean canMove, boolean canResize) { super(widget_, canMove, canResize); } - - /** - * surcharge de la methode menu pour ne pas cree de sous menus. - */ - public void setMenu() { - - // ne rien faire + + @Override + protected boolean isMenuAllowed() { + return false; } + } Added: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerForGroup.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerForGroup.java (rev 0) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerForGroup.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -0,0 +1,26 @@ +/** + * Licence GPL + * Copyright Genesis + */ +package org.fudaa.ebli.visuallibrary; + +import javax.swing.JPopupMenu; + +import org.fudaa.ebli.visuallibrary.actions.EbliWidgetUngroupAction; + +/** + * @author deniger + */ +public class EbliWidgetControllerForGroup extends EbliWidgetController { + + public EbliWidgetControllerForGroup(EbliWidget _widget) { + super(_widget,true,true,false); + } + + @Override + protected void buildPopupMenu(JPopupMenu _menu) { + super.buildPopupMenu(_menu); + EbliNode n=(EbliNode) getWidget().getEbliScene().findObject(getWidget()); + _menu.add(new EbliWidgetUngroupAction(getWidget().getEbliScene(),n)); + } +} Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerMenuOnly.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerMenuOnly.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetControllerMenuOnly.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -1,37 +1,33 @@ package org.fudaa.ebli.visuallibrary; /** - * Classe qui herite du controller. Gere uniquement les menus. Pas d actions - * gerees par ce controlleur. + * Classe qui herite du controller. Gere uniquement les menus. Pas d actions gerees par ce controlleur. * * @author Adrien Hadoux. - * */ public class EbliWidgetControllerMenuOnly extends EbliWidgetController { - public EbliWidgetControllerMenuOnly(EbliWidget widget_) { - this(widget_, true); + public EbliWidgetControllerMenuOnly(EbliWidget widget) { + this(widget, true); } public EbliWidgetControllerMenuOnly(EbliWidget widget_, boolean canDuplicate) { super(widget_, true, true, canDuplicate); - - + } - - - /** + + /** * surcharge de la methode pour ne pas creer d actions. */ - public void createdefaultAction() { - // -- construction des actions --// - //widget_.getActions().addAction(widget_.getEbliScene().createSelectAction() - // ); - // widget_.getActions().addAction(ActionFactory.createResizeAction()); - // widget_.getActions().addAction(widget_.getEbliScene(). - // createWidgetHoverAction()); - // widget_.getActions().addAction(widget_.getEbliScene().getMoveAction()); + public void createDefaultAction() { + // -- construction des actions --// + // widget_.getActions().addAction(widget_.getEbliScene().createSelectAction() + // ); + // widget_.getActions().addAction(ActionFactory.createResizeAction()); + // widget_.getActions().addAction(widget_.getEbliScene(). + // createWidgetHoverAction()); + // widget_.getActions().addAction(widget_.getEbliScene().getMoveAction()); } - + } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreator.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreator.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreator.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -15,6 +15,6 @@ */ EbliNode duplicate(EbliNode _nodeAdupliquer); - EbliWidgetBordure getBordure(); + EbliWidgetWithBordure getBordure(); } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorDblFleche.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorDblFleche.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorDblFleche.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -52,7 +52,7 @@ return duplique; } - public EbliWidgetBordure getBordure() { + public EbliWidgetWithBordure getBordure() { return null; } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorFleche.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorFleche.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorFleche.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -51,7 +51,7 @@ return duplique; } - public EbliWidgetBordure getBordure() { + public EbliWidgetWithBordure getBordure() { return null; } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorImage.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorImage.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorImage.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -13,7 +13,7 @@ Image image_; // EbliWidgetImage res; - EbliWidgetBordure res; + EbliWidgetWithBordure res; public EbliWidgetCreatorImage(Image g) { @@ -31,7 +31,7 @@ public EbliWidget create(EbliScene _scene) { - res = new EbliWidgetBordure(new EbliWidgetImage(_scene, getG())); + res = new EbliWidgetBordureSingle(new EbliWidgetImage(_scene, getG())); return res; } @@ -58,7 +58,7 @@ return duplique; } - public EbliWidgetBordure getBordure() { + public EbliWidgetWithBordure getBordure() { return res; } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorShape.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorShape.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorShape.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -68,7 +68,7 @@ - public EbliWidgetBordure getBordure() { + public EbliWidgetWithBordure getBordure() { return null; } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorTextEditor.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorTextEditor.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorTextEditor.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -14,7 +14,7 @@ CtuluHtmlEditorPanel editorPane_; // EbliWidgetTextEditor res; - EbliWidgetBordure res; + EbliWidgetWithBordure res; public EbliWidgetCreatorTextEditor(CtuluHtmlEditorPanel g) { @@ -32,7 +32,7 @@ public EbliWidget create(EbliScene _scene) { - res = new EbliWidgetBordure(new EbliWidgetTextEditor(_scene, getG())); + res = new EbliWidgetBordureSingle(new EbliWidgetTextEditor(_scene, getG())); return res; } @@ -61,7 +61,7 @@ } - public EbliWidgetBordure getBordure() { + public EbliWidgetWithBordure getBordure() { return res; } } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorTextLabel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorTextLabel.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetCreatorTextLabel.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -8,7 +8,7 @@ String label_; // EbliWidgetRectangle res; - EbliWidgetBordure res; + EbliWidgetWithBordure res; public EbliWidgetCreatorTextLabel(String g) { super(); this.label_ = g; @@ -23,7 +23,7 @@ } public EbliWidget create(EbliScene _scene) { - res = new EbliWidgetBordure(new EbliWidgetTextLabel(_scene, getG())); + res = new EbliWidgetBordureSingle(new EbliWidgetTextLabel(_scene, getG())); return res; } @@ -51,7 +51,7 @@ return duplique; } - public EbliWidgetBordure getBordure() { + public EbliWidgetWithBordure getBordure() { return res; } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGroupCreator.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGroupCreator.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetGroupCreator.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -23,7 +23,7 @@ return null; } - public EbliWidgetBordure getBordure() { + public EbliWidgetWithBordure getBordure() { return null; } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetImage.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetImage.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetImage.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -15,7 +15,7 @@ // -- controller menu seulement, la bordure englobante contient le // controller action --// - setController_(new EbliWidgetControllerMenuOnly(this)); + setController(new EbliWidgetControllerMenuOnly(this)); } Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetSynchroniser.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetSynchroniser.java 2008-09-14 20:25:20 UTC (rev 3923) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetSynchroniser.java 2008-09-14 20:51:52 UTC (rev 3924) @@ -22,11 +22,9 @@ import com.memoire.fu.FuLog; /** - * Classe qui gere la synchronisation entre la scene et les autres composants d - * affichage de la scene tel que l arbre. + * Classe qui gere la synchronisation entre la scene et les autres composants d affichage de la scene tel que l arbre. * * @author Adrien Hadoux - * */ public class EbliWidgetSynchroniser implements ObjectSceneListener, TreeSelectionListener { @@ -38,34 +36,31 @@ * l arbre representant la scene. */ EbliWidgetJXTreeTableModel treeModel_; - - + JXTreeTable arbre_; - + /** - * booleen qui permet d eviter de realiser des cycles entre la selection des - * nodes sur le tree et sur la scene. + * booleen qui permet d eviter de realiser des cycles entre la selection des nodes sur le tree et sur la scene. */ boolean noCycleScene = true; boolean noCycleTree = false; - + public EbliWidgetSynchroniser(EbliWidgetJXTreeTableModel treeModel, JXTreeTable arbre) { super(); treeModel_ = treeModel; this.scene_ = treeModel_.getScene(); arbre_ = arbre; - - + // -- ajout du synchroniser comme listener du tree selecter --// - + arbre_.addTreeSelectionListener(this); - + // -- gestion des popupMenus sur le jtree --// arbre_.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) { if (e.isPopupTrigger() && e.getClickCount() == 1) { affichePopupNode(e.getX(), e.getY()); - + } } @@ -75,13 +70,11 @@ } } }); - - + } /** - * Methode qui affiche la popup du node selectionn\xE9. entree: la position ou - * afficher la popup + * Methode qui affiche la popup du node selectionn\xE9. entree: la position ou afficher la popup * * @param x * @param y @@ -95,177 +88,135 @@ // Display the name of the selected tree element in the selection field MutableTreeTableNode treeNode = null; - if (clickedElement != null) - treeNode = (MutableTreeTableNode) clickedElement.getLastPathComponent(); - + if (clickedElement != null) treeNode = (MutableTreeTableNode) clickedElement.getLastPathComponent(); + if (treeNode != null) { // -- recuperation du node associe --// EbliNode node = (EbliNode) treeNode.getUserObject(); - + if (node != null && node.hasWidget() && node.getWidget().isVisible()) { - - + // -- recuperation de la popup du node et ajout a l element du tree a al // bonne location--// - JPopupMenu poppup =null; - + JPopupMenu poppup = null; + // -- cas ou la widget selectionnee est la bordure, il faut recuperer // son contenant --// - if (node.getWidget() instanceof EbliWidgetBordure) { - EbliWidgetBordure bordure = (EbliWidgetBordure) node.getWidget(); + if (node.getWidget() instanceof EbliWidgetBordureSingle) { + EbliWidgetBordureSingle bordure = (EbliWidgetBordureSingle) node.getWidget(); poppup = bordure.intern_.getController().getPopup(); - - } else - poppup = node.getWidget().getController().getPopup(); - - poppup.show(arbre_, x, y); - - + + } else poppup = node.getWidget().getController().getPopup(); + if (poppup != null) poppup.show(arbre_, x, y); + } - + } - - } - public void focusChanged(ObjectSceneEvent event, Object previousFocusedObject, Object newFocusedObject) { } - public void highlightingChanged(ObjectSceneEvent event, Set<Object> previousHighlighting, Set<Object> newHighlighting) { - } + public void focusChanged(ObjectSceneEvent event, Object previousFocusedObject, Object newFocusedObject) {} - public void hoverChanged(ObjectSceneEvent event, Object previousHoveredObject, Object newHoveredObject) { - } + public void highlightingChanged(ObjectSceneEvent event, Set<Object> previousHighlighting, Set<Object> newHighlighting) {} - public void objectAdded(ObjectSceneEvent event, Object addedObject) { - } + public void hoverChanged(ObjectSceneEvent event, Object previousHoveredObject, Object newHoveredObject) {} - public void objectRemoved(ObjectSceneEvent event, Object removedObject) { - } + public void objectAdded(ObjectSceneEvent event, Object addedObject) {} + public void objectRemoved(ObjectSceneEvent event, Object removedObject) {} + public void objectStateChanged(ObjectSceneEvent event, Object changedObject, ObjectState previousState, - ObjectState newState) { - } + ObjectState newState) {} /** - * Des que la selection change dans la scene, on selectionne le noeud - * correspondand dans le tree. + * Des que la selection change dans la scene, on selectionne le noeud correspondand dans le tree. */ public void selectionChanged(ObjectSceneEvent event, Set<Object> previousSelection, Set<Object> newSelection) { FuLog.warning("NOCYCLE DE SCENE " + noCycleScene); - - - - - + if (noCycleScene) { - + // on bloque l'effet cycle noCycleScene = false; - - final Set<Object> newSelection_ = newSelection; - - if (newSelection_ != null && newSelection_.size() != 0) { - - - - DefaultListSelectionModel model = (DefaultListSelectionModel) arbre_.getSelectionModel();// new - // DefaultListSelectionModel - - // -- mise a jour de la selection a vide--// + + if (newSelection != null && newSelection.size() != 0) { + + DefaultListSelectionModel model = (DefaultListSelectionModel) arbre_.getSelectionModel();// new + // DefaultListSelectionModel + + // -- mise a jour de la selection a vide--// model.clearSelection(); - + FuLog.warning("ITERATOR CHERIE"); - for (Iterator<Object> it = newSelection_.iterator(); it.hasNext();) { - // -- recuperation du node selectionne --// + for (Iterator<Object> it = newSelection.iterator(); it.hasNext();) { + // -- recuperation du node selectionne --// final EbliNode nodeSelect = (EbliNode) it.next(); - - - MutableTreeTableNode treeNode=treeModel_.findTreeTableNode(nodeSelect); - - model.addSelectionInterval(treeModel_.getIndexOfChild(treeModel_.getRoot(), treeNode), treeModel_ - .getIndexOfChild(treeModel_.getRoot(), treeNode)); - - // fonctionne que pour une seule selection - // arbre_.setRowSelectionInterval(treeModel_.getIndexOfChild(treeModel_. - // getRoot(), treeNode), treeModel_ - // .getIndexOfChild(treeModel_.getRoot(), treeNode)); - // arbre_.setSelectionModel(model); - - } - arbre_.validate(); + MutableTreeTableNode treeNode = treeModel_.findTreeTableNode(nodeSelect); + + model.addSelectionInterval(treeModel_.getIndexOfChild(treeModel_.getRoot(), treeNode), treeModel_ + .getIndexOfChild(treeModel_.getRoot(), treeNode)); + + // fonctionne que pour une seule selection + // arbre_.setRowSelectionInterval(treeModel_.getIndexOfChild(treeModel_. + // getRoot(), treeNode), treeModel_ + // .getIndexOfChild(treeModel_.getRoot(), treeNode)); + + // arbre_.setSelectionModel(model); + + } + arbre_.validate(); // mise a jour de la scene scene_.refresh(); - - - } else { + + } else { arbre_.clearSelection(); - } - - ... [truncated message content] |
From: <had...@us...> - 2008-09-13 20:45:04
|
Revision: 3922 http://fudaa.svn.sourceforge.net/fudaa/?rev=3922&view=rev Author: hadouxad Date: 2008-09-13 20:45:15 +0000 (Sat, 13 Sep 2008) Log Message: ----------- COrrection bugs - action configurer: delegue toujours a son widgetBordure. - cas special legende: Copier/couper: lors de la copie/couper de legende, n enregistre rien pour eviter le plantage. Correction bug wizard courbes temporelles - l'action ajouter en cliquant sur la ligene de la cellule vide - action supprimer: qui supprime les points saisis - action modifs: en double cliquant sur les cellules (cf setValueAt) - s'il n'y a pas de graphe dispo, l'option cr?\195?\169e un nouveau graphe doit etre coch?\195?\169e et disable ( l'utilisateur n'a pas le choix...) - Bug bizarre lors de la saisie de certains points pour les courbes temporelles... FONCTION AJOUT COURBE SOURCE OK!! - Fonction clic droit sur courbe du graphe FONCTIONNE! - methode TrPostCourbeTreeModel.duplicateWithChooseSrc() - Il fallait initialiser le tableau des y en recuperant la taille du y de son duplicata - utilsier la methode update - GESTION DE TOUS LEs CAS (tentative) - creation courbe REELLE sur nouveau src depuis courbe REELLE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe REELLE ancien source - creation courbe REELLE sur nouveau src depuis courbe INTERPOLEE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe INTERPOLEE ancien source Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2008-09-13 20:38:41 UTC (rev 3921) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostLayoutFille.java 2008-09-13 20:45:15 UTC (rev 3922) @@ -31,14 +31,11 @@ import org.fudaa.ebli.visuallibrary.actions.CommandUndoRedoPaste; import org.fudaa.ebli.visuallibrary.actions.EbliWidgetActionConfigure; import org.fudaa.ebli.visuallibrary.calque.CalqueLegendeWidgetAdapter; +import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorLegende; import org.fudaa.ebli.visuallibrary.calque.EbliWidgetCreatorVueCalque; import org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorGraphe; import org.fudaa.fudaa.tr.common.TrLib; import org.fudaa.fudaa.tr.common.TrResource; -import org.netbeans.api.visual.model.ObjectSceneEvent; -import org.netbeans.api.visual.model.ObjectSceneEventType; -import org.netbeans.api.visual.model.ObjectSceneListener; -import org.netbeans.api.visual.model.ObjectState; import org.netbeans.api.visual.widget.Widget; import com.memoire.bu.BuCutCopyPasteInterface; @@ -58,8 +55,8 @@ BuUndoRedoInterface, BuCutCopyPasteInterface, EbliWidgetEditModeListener { /** - * - */ + * + */ private static final long serialVersionUID = -2769884291563880931L; /** @@ -294,9 +291,12 @@ // --recuperation des noeuds a copier --// projet_.nodesCopyied = new HashSet<EbliNode>(); - for (Iterator<EbliNode> it = ((Set<EbliNode>) getScene().getSelectedObjects()).iterator(); it.hasNext();) - projet_.nodesCopyied.add(it.next()); - + for (Iterator<EbliNode> it = ((Set<EbliNode>) getScene().getSelectedObjects()).iterator(); it.hasNext();) { + EbliNode node = it.next(); + if (!(node.getCreator() instanceof EbliWidgetCreatorLegende) + && !(node.getCreator() instanceof org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorLegende)) + projet_.nodesCopyied.add(node); + } // -- reinit de la commande cut si on voulait faire un ctrl+x projet_.nodesCutted = null; } @@ -316,6 +316,8 @@ for (Iterator<EbliNode> it = ((Set<EbliNode>) getScene().getSelectedObjects()).iterator(); it.hasNext();) { EbliNode node = it.next(); + if (!(node.getCreator() instanceof EbliWidgetCreatorLegende) + && !(node.getCreator() instanceof org.fudaa.ebli.visuallibrary.graphe.EbliWidgetCreatorLegende)) projet_.nodesCutted.add(node); } @@ -333,6 +335,7 @@ projet_.nodesCopyied = null; // --creation de la commande undo/redo --// + if (projet_.nodesCutted != null && projet_.nodesCutted.size() != 0) getScene().getCmdMng().addCmd(new CommandUndoRedoCut(projet_.nodesCutted)); } @@ -371,6 +374,7 @@ } // --creation de la commande undo/redo --// + if (newNodes.size() != 0) getScene().getCmdMng().addCmd(new CommandUndoRedoPaste(newNodes)); // reinitialisation de la liste @@ -387,6 +391,7 @@ getScene().addNode(node); } // --creation de la commande undo/redo --// + if (projet_.nodesCutted != null && projet_.nodesCutted.size() != 0) getScene().getCmdMng().addCmd(new CommandUndoRedoPaste(projet_.nodesCutted)); // reinit de la liste @@ -452,7 +457,15 @@ changeTree(node.getWidget().getController()); // -- etape 2: rechargement de la toolbar specifique dans this --// + changeToolbarSpecifiqueGraphe(node.getWidget().getController(), (EbliWidgetCreatorGraphe) node.getCreator()); + } else { + + // -- etape 1: on fout eventuellement le tree des layouts --// + changeTreeScene(); + // -- etape 2: rechargement de la toolbar specifique dans this --// + changeToolbarScene(); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <had...@us...> - 2008-09-13 20:38:31
|
Revision: 3921 http://fudaa.svn.sourceforge.net/fudaa/?rev=3921&view=rev Author: hadouxad Date: 2008-09-13 20:38:41 +0000 (Sat, 13 Sep 2008) Log Message: ----------- COrrection bugs - action configurer: delegue toujours a son widgetBordure. - cas special legende: Copier/couper: lors de la copie/couper de legende, n enregistre rien pour eviter le plantage. Correction bug wizard courbes temporelles - l'action ajouter en cliquant sur la ligene de la cellule vide - action supprimer: qui supprime les points saisis - action modifs: en double cliquant sur les cellules (cf setValueAt) - s'il n'y a pas de graphe dispo, l'option cr?\195?\169e un nouveau graphe doit etre coch?\195?\169e et disable ( l'utilisateur n'a pas le choix...) - Bug bizarre lors de la saisie de certains points pour les courbes temporelles... FONCTION AJOUT COURBE SOURCE OK!! - Fonction clic droit sur courbe du graphe FONCTIONNE! - methode TrPostCourbeTreeModel.duplicateWithChooseSrc() - Il fallait initialiser le tableau des y en recuperant la taille du y de son duplicata - utilsier la methode update - GESTION DE TOUS LEs CAS (tentative) - creation courbe REELLE sur nouveau src depuis courbe REELLE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe REELLE ancien source - creation courbe REELLE sur nouveau src depuis courbe INTERPOLEE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe INTERPOLEE ancien source Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostWizardCourbeTemporelle.java Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2008-09-13 20:37:51 UTC (rev 3920) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeTreeModel.java 2008-09-13 20:38:41 UTC (rev 3921) @@ -26,15 +26,19 @@ import org.fudaa.ctulu.CtuluLibArray; import org.fudaa.ctulu.ProgressionInterface; import org.fudaa.ctulu.ProgressionUpdater; +import org.fudaa.ctulu.gis.GISPrecision; import org.fudaa.dodico.h2d.type.H2dVariableType; import org.fudaa.ebli.courbe.EGAxeVertical; import org.fudaa.ebli.courbe.EGCourbe; import org.fudaa.ebli.courbe.EGCourbeChild; import org.fudaa.ebli.courbe.EGGrapheTreeModel; import org.fudaa.ebli.courbe.EGGroup; +import org.fudaa.ebli.geometrie.GrPoint; import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation; import org.fudaa.fudaa.tr.common.TrResource; +import org.fudaa.fudaa.tr.post.TrPostCourbeModel.Node; +import com.memoire.bu.BuDialogChoice; import com.memoire.bu.BuLib; import com.memoire.fu.FuComparator; import com.memoire.fu.FuEmptyArrays; @@ -70,6 +74,8 @@ Set varSupported_; + TrPostProjet projet_; + public Set getVarSupported() { return varSupported_; } @@ -95,7 +101,7 @@ * ] * _timeIdx */, - final H2dVariableType[] _vars) { + final H2dVariableType[] _vars, TrPostProjet _projet) { src_ = _src; varGroup_ = new HashMap(); // tidx_ = _timeIdx; @@ -105,6 +111,7 @@ varSupported_ = new HashSet(Arrays.asList(_vars)); impl_ = _impl; isAllTimeStep_ = true;// tidx_.length == _src.getNbTimeStep(); + projet_ = _projet; } public TrPostCourbeTreeModel(final FudaaCommonImplementation _impl, final TrPostSource _src,/* @@ -115,15 +122,15 @@ * _timeIdx * , */ - final int[] _objIdx, final H2dVariableType[] _vars) { - this(_impl, _src/* , _timeIdx */, _vars); + final int[] _objIdx, final H2dVariableType[] _vars, TrPostProjet _projet) { + this(_impl, _src/* , _timeIdx */, _vars, _projet); objIdx_ = _objIdx; Arrays.sort(objIdx_); } public TrPostCourbeTreeModel(final FudaaCommonImplementation _impl, final TrPostSource _src, final int[] _timeIdx, - final TrPostInterpolatePoint _interpol, final H2dVariableType[] _vars) { - this(_impl, _src/* , _timeIdx */, _vars); + final TrPostInterpolatePoint _interpol, final H2dVariableType[] _vars, TrPostProjet _projet) { + this(_impl, _src/* , _timeIdx */, _vars, _projet); intepolPt_.add(_interpol); } @@ -692,7 +699,147 @@ return isAllTimeStep_; } - // public void updateTimeStep(int[] _idx, ProgressionInterface _prog) { - // } + protected EGCourbeChild duplicateCourbe(final EGCourbeChild _c) { + return null; + } + + String[] formattageDonnees() { + String[] listeSimul = new String[projet_.listeSrc_.size()]; + int cpt = 0; + for (Iterator<TrPostSource> it = projet_.listeSrc_.iterator(); it.hasNext();) { + + TrPostSource src = it.next(); + + // --ajout dans la liste des titres --// + listeSimul[cpt++] = projet_.formatInfoSource(src); + } + + return listeSimul; + } + + /** + * OVERIDE. methode qui demande a l user de choisir sa courbe puis genere une + * copie avec la source en cours. + * + * @param _child + * @return + */ + protected EGCourbeChild duplicateWithChooseSrc(EGCourbeChild _child) { + + + // -- mise en place du chooser des projets sources disponibles --// + + // -- recuperation du source voulu --// + // -- recuperation de la liste des src sous forme de liste --// + String[] values = formattageDonnees(); + + // -- ouverture du chooser --// + BuDialogChoice chooser = new BuDialogChoice(projet_.impl_.getApp(), projet_.impl_.getInformationsSoftware(), + TrResource.getS("Cr\xE9ation d'un calque"), TrResource.getS("S\xE9lectionnez le jeux de donn\xE9es "), values); + + int response = chooser.activate(); + + if (response == 0) { + + int indiceSOURCESelect = chooser.getSelectedIndex(); + + TrPostSource srcChoisie=projet_.getSource(indiceSOURCESelect); + + + EGCourbeChild newCurve=null; + + //-- recuperation du point interpol\xE9 ou non selon le cas --// + if(_child.getModel() instanceof TrPostCourbeModel.Node){ + + // -- CAS COURBE REELLE --// + TrPostCourbeModel.Node modelBase=(Node) _child.getModel(); + H2dVariableType var = modelBase.getVar(); + + // -- verification si le point du model choisi est reel ou interpol\xE9 + // dans la nouvelle source --// + if (srcChoisie.getGrid().contientPoint(src_.getGrid().getPtX(modelBase.ptIdx_), + src_.getGrid().getPtY(modelBase.ptIdx_))) { + + // -- CREATION DE LA COURBE REELE DEPUIS COURBE REELLE --// + newCurve = TrPostCourbeModel.Node.buildCourbeModel(var, modelBase.ptIdx_, modelBase.getTime(), + _child.getParentGroup(), srcChoisie); + } else { + // -- on recupere le point le plus proche pour interpoler --// + GrPoint pointAInterpole=new GrPoint(src_.getGrid().getPtX(modelBase.ptIdx_),src_.getGrid().getPtY(modelBase.ptIdx_),0); + int newPtIdx = TrIsoLayerDefault.sondeSelection(pointAInterpole, srcChoisie.getGrid()); + + if (newPtIdx != -1) { + + TrPostInterpolatePoint interpolatePoint = new TrPostInterpolatePoint(newPtIdx, pointAInterpole.x_, + pointAInterpole.y_, new GISPrecision()); + + // -- CREATION DE LA COURBE INTERPOLEE DEPUIS COURBE REELLE --// + newCurve = TrPostCourbeModel.Interpolated.buildCourbeModel(modelBase.getVar(), interpolatePoint, modelBase + .getTime(), _child.getParentGroup(), srcChoisie); + } + } + + // -- recuperation des y de son duplicata --// + ((TrPostCourbeModel) newCurve.getModel()).setY(new double[modelBase.getY().length]); + + double[] ds = modelBase.getTime(); + for (int i = 0; i < ds.length; i++) { + ((TrPostCourbeModel) newCurve.getModel()).updateY(i, var); + } + + } + else{ + + // -- CAS COURBE INTERPOLEE --// + TrPostCourbeModel.Interpolated modelBase=(TrPostCourbeModel.Interpolated) _child.getModel(); + H2dVariableType var = modelBase.getVar(); + + // -- verification si le point du model choisi est reel ou interpol\xE9 + // dans la nouvelle source --// + if (srcChoisie.getGrid().contientPoint(modelBase.ptIdx_.x_, modelBase.ptIdx_.y_)) { + + // -- recuperation du point interpol\xE9 pour la nouvelle source --// + GrPoint pointInterpol = new GrPoint(modelBase.ptIdx_.x_, modelBase.ptIdx_.y_, 0); + int newPtIdx = TrIsoLayerDefault.sondeSelection(pointInterpol, srcChoisie.getGrid()); + if (newPtIdx != -1) { + // -- CREATION DE LA COURBE REELE DEPUIS COURBE INTERPOLEE --// + newCurve = TrPostCourbeModel.Node.buildCourbeModel(var, newPtIdx, modelBase.getTime(), _child + .getParentGroup(), srcChoisie); + } + } else { + // -- on recupere le point le plus proche pour interpoler --// + GrPoint pointInterpol = new GrPoint(modelBase.ptIdx_.x_, modelBase.ptIdx_.y_, 0); + int newPtIdx = TrIsoLayerDefault.sondeSelection(pointInterpol, srcChoisie.getGrid()); + + if (newPtIdx != -1) { + + TrPostInterpolatePoint interpolatePoint = new TrPostInterpolatePoint(newPtIdx, modelBase.ptIdx_.x_, + modelBase.ptIdx_.y_, new GISPrecision()); + + // -- CREATION DE LA COURBE INTERPOLEE DEPUIS COURBE INTERPOLEE --// + newCurve = TrPostCourbeModel.Interpolated.buildCourbeModel(modelBase.getVar(), interpolatePoint, modelBase + .getTime(), _child.getParentGroup(), srcChoisie); + } + } + + + // -- recuperation des y de son duplicata --// + ((TrPostCourbeModel) newCurve.getModel()).setY(new double[modelBase.getY().length]); + double[] ds = modelBase.getTime(); + for (int i = 0; i < ds.length; i++) { + ((TrPostCourbeModel) newCurve.getModel()).updateY(i, var); + } + + } + newCurve.setTitle(newCurve.getTitle() + " " + + projet_.formatName(projet_.getSource(indiceSOURCESelect).getTitle())); + + + return newCurve; + } + return null; + } + + } Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostWizardCourbeTemporelle.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostWizardCourbeTemporelle.java 2008-09-13 20:37:51 UTC (rev 3920) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostWizardCourbeTemporelle.java 2008-09-13 20:38:41 UTC (rev 3921) @@ -31,7 +31,6 @@ import com.memoire.bu.BuCheckBox; import com.memoire.bu.BuScrollPane; import com.memoire.bu.BuTextField; -import com.memoire.bu.BuValueValidator; import com.memoire.bu.BuWizardTask; import com.memoire.fu.FuLog; @@ -88,8 +87,79 @@ public class ModelListePoints extends AbstractTableModel { - String[] titre_; + // -- variables utilisees pour stocker la saisie de l utilisateur + String xTempCreate = null; + String yTempCreate = null; + public void setValueAt(Object _value, int _rowIndex, int _columnIndex) { + + if (_columnIndex == 0) + return; + + // -- cas edition interne de nouveau point --// + if (ptIdx_ != null && _rowIndex == ptIdx_.length) { + if (_columnIndex == 1) { + xTempCreate = (String) _value; + + } else if (_columnIndex == 2) { + + yTempCreate = (String) _value; + } + + // -- verification si les 2 params sont saisis, on ajoute le point au + // tableau + if (xTempCreate != null && yTempCreate != null) { + + if (!checkAndReplaceSonde(xTempCreate, yTempCreate, this, ptIdx_.length)) { + + projet_.impl_.error("Le point rentr\xE9 n'est pas dans le maillage."); + //-- on reintialise les donnees --// + if (_columnIndex == 1) { + xTempCreate = null; + + } else if (_columnIndex == 2) { + yTempCreate = null; + } + + } else { + + // -- le point est ajout\xE9 auto dans la methode check, on + // repositionne anull les temp --// + xTempCreate = null; + yTempCreate = null; + } + } + + } else { + // cas normal de modif de val --// + if (_columnIndex == 1) { + String val = (String) _value; + // -- on recupere le y et on v\xE9rifie que le point est toujours bon + // --// + String y = (String) getValueAt(_rowIndex, 2); + + if (!checkAndReplaceSonde(xTempCreate, yTempCreate, this, _rowIndex)) { + projet_.impl_.error("Le point rentr\xE9 n'est pas dans le maillage."); + } + + + } else if (_columnIndex == 2) { + + String val = (String) _value; + // -- on recupere le x et on v\xE9rifie que le point est toujours bon + // --// + String x = (String) getValueAt(_rowIndex, 1); + + + + } + + } + + } + + String[] titre_; + public ModelListePoints() { String[] val = { "Point", "X", "Y" }; titre_ = val; @@ -111,12 +181,24 @@ public int getRowCount() { if (ptIdx_ != null) - return ptIdx_.length; + return ptIdx_.length + 1; else return 1; } public Object getValueAt(int _rowIndex, int _columnIndex) { + + // -- cas edition interne de nouveau point --// + if (ptIdx_ != null && _rowIndex == ptIdx_.length) + if (_columnIndex == 1 && xTempCreate != null) + return xTempCreate; + else if (_columnIndex == 2 && yTempCreate != null) + return yTempCreate; + else + return ""; + + + if(_columnIndex==0){ if(ptIdx_!=null) return ptIdx_[_rowIndex]; @@ -150,7 +232,10 @@ } public boolean isCellEditable(int _rowIndex, int _columnIndex) { + if (_columnIndex == 0) return false; + else + return true; } @@ -172,6 +257,11 @@ pt_ = _pt; ptIdx_ = _ptIdx; + // -- si les 2 sont nuls, on initialise la liste des points modifiable --// + if (pt_ == null && ptIdx_ == null) + ptIdx_ = new int[0]; + + // creationNewGraphe_.addActionListener(new ActionListener() { // // public void actionPerformed(ActionEvent _e) { @@ -269,7 +359,8 @@ final JXTable tableau = new JXTable(model); content.add(new BuScrollPane(tableau), BorderLayout.CENTER); if (pt_ == null) { - content.add(new JLabel(TrResource.getS("Choisir parmi les points selectionn\xE9s.")), BorderLayout.NORTH); + content.add(new JLabel(TrResource.getS("Saisir ou modifier des points en cliquant dans le tableau.")), + BorderLayout.NORTH); } else @@ -277,47 +368,58 @@ // -- ajout du jtext pour ajout uniquement d'un point interpol\xE9 --// - if (ptIdx_ == null) { + if (ptIdx_ != null) { JPanel control = new JPanel(new FlowLayout(FlowLayout.CENTER)); - control.add(new JLabel(TrResource.getS("Cr\xE9ez votre point interpol\xE9. x:"))); - tf1_1 = new BuTextField(10); - tf1_1.setValueValidator(BuValueValidator.DOUBLE); - tf1_2 = new BuTextField(10); - tf1_2.setValueValidator(BuValueValidator.DOUBLE); - control.add(tf1_1); - control.add(new JLabel("y:")); - control.add(tf1_2); - JButton valide = new JButton(EbliResource.EBLI.getIcon("crystal_valider")); - valide.addActionListener(new ActionListener() { + control.add(new JLabel(TrResource.getS("Supprimer les points s\xE9lectionn\xE9s:"))); + + JButton supprimer = new JButton("Supprimer", EbliResource.EBLI.getIcon("crystal_supprimer")); + supprimer.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent _e) { - if (!checkAndReplaceSonde(tf1_1.getText(), tf1_2.getText(), model)) { - projet_.getImpl().error(TrResource.getS("Le point rentr\xE9 n'est pas correct")); - } + + int[] listePointToDelete = tableau.getSelectedRows(); + + if (listePointToDelete != null) { + + + boolean selectEmptyRow = false; + for (int i = 0; !selectEmptyRow && i < listePointToDelete.length; i++) + if (listePointToDelete[i] == ptIdx_.length) + selectEmptyRow = true; + + int[] newTab = null; + if (selectEmptyRow) + newTab = new int[ptIdx_.length - listePointToDelete.length + 1]; + else + newTab = new int[ptIdx_.length - listePointToDelete.length]; + + int cpt = 0; + for (int i = 0; i < ptIdx_.length; i++) { + + boolean mustDelete = false; + + for (int k = 0; !mustDelete && k < listePointToDelete.length; k++) + if (listePointToDelete[k] ==i) + mustDelete = true; + + if(!mustDelete) + newTab[cpt++] = ptIdx_[i]; + + + } + + ptIdx_ = newTab; + + model.fireTableDataChanged(); + } + } }); - control.add(valide); + control.add(supprimer); content.add(control, BorderLayout.SOUTH); - } else { - // -- fonction specifique a la liste de points reels: possibilit\xE9de - // degager els points snon selectionner --// - JPanel control = new JPanel(new FlowLayout(FlowLayout.CENTER)); - control.add(new JLabel(TrResource - .getS("Garder uniquement les points choisis (ctrl+ clic pour en choisir plusieurs)"))); - JButton valide = new JButton(EbliResource.EBLI.getIcon("crystal_valider")); - valide.addActionListener(new ActionListener() { + } - public void actionPerformed(ActionEvent _e) { - checkAndReplacePoints(model, tableau.getSelectedRows()); - - } - - }); - control.add(valide); - content.add(control, BorderLayout.SOUTH); - } - return content; } @@ -333,6 +435,11 @@ JPanel bouttonCenter = new JPanel(new FlowLayout(FlowLayout.CENTER)); bouttonCenter.add(creationNewGraphe_); content.add(bouttonCenter, BorderLayout.SOUTH); + if (actionChoixGraphes_.listeGraphesPossibles.size() == 0 && actionChoixGraphes_.listeGraphesChoisis.size() == 0) { + creationNewGraphe_.setSelected(true); + creationNewGraphe_.setEnabled(false); + actionChoixGraphes_.setEnabled(false); + } return content; } } @@ -342,22 +449,38 @@ /** * Methode qui verifie que le nouveau point peut etre une sonde et le remplace - * par l actuelle. + * par l actuel ou alors l ajoute dans le tableau selon l indice. */ - public boolean checkAndReplaceSonde(String xs, String ys, ModelListePoints model) { + public boolean checkAndReplaceSonde(String xs, String ys, ModelListePoints model, int _indiceTableauAmodif) { double x = Double.parseDouble(xs); double y = Double.parseDouble(ys); GrPoint point=new GrPoint( x,y,0); + + + // -- verification que le point peut etre une sonde --// int idxElt = TrIsoLayerDefault.sondeSelection(point, (TrPostModelInterface) calque_.getIsoLayer().getIsoModel()); if (idxElt > -1){ //--on remoplace la sonde actuelle --// pt_ = new TrPostInterpolatePoint(idxElt, x, y, new GISPrecision()); - // -- mise a jour des donnees sur le calque --// - int[] newVal = new int[1]; - newVal[0] = pt_.idxElt_; + + + + if (_indiceTableauAmodif < ptIdx_.length) + this.ptIdx_[_indiceTableauAmodif] = pt_.idxElt_; + else { + // -- il faut reconstruire le tableau avec size +1 en ajoutant le point + int[] newVal = new int[ptIdx_.length + 1]; + for (int i = 0; i < ptIdx_.length; i++) { + newVal[i] = ptIdx_[i]; + FuLog.warning("ptIdx_[" + i + "]=" + newVal[i]); + } + newVal[ptIdx_.length] = pt_.idxElt_; + ptIdx_ = newVal; + + } model.fireTableDataChanged(); return true; } @@ -365,21 +488,8 @@ } - public void checkAndReplacePoints(ModelListePoints model, int[] pointsChoisis) { - - int[] newPtIdx=new int[pointsChoisis.length]; - for (int i = 0; i < pointsChoisis.length; i++) { - newPtIdx[i] = ptIdx_[pointsChoisis[i]]; - } - ptIdx_ = newPtIdx; - // -- mise a jour des donnees sur le calque --// - // ((ZCalqueAffichageDonnees) - // calque_.getCalqueActif()).setSelection(ptIdx_); - // -- mise a joru des donnees sur le model --// - model.fireTableDataChanged(); - - } + private static int cptGraphe = 1; /** * Action de creation d un nouveau widget graphe en live @@ -399,13 +509,13 @@ FuLog.warning("Sonde: " + pt_ + "\n liste points. " + ptIdx_); // -- cas listes de noeuds if (pt_ == null) - model = TrPostCourbeBuilder.build(projet_.getImpl(), calque_.getSourceCalque(), chooserVarTime_ + model = TrPostCourbeBuilder.build(projet_, calque_.getSourceCalque(), chooserVarTime_ .getSelectedTimeStepIdx(), var, ptIdx_, prog); else // -- cas sonde --// if (ptIdx_ == null || ptIdx_.length == 0) model = TrPostCourbeBuilder.build( - projet_.getImpl(), calque_.getSourceCalque(), + projet_, calque_.getSourceCalque(), chooserVarTime_ .getSelectedTimeStepIdx(), var, pt_, prog); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <had...@us...> - 2008-09-13 20:37:40
|
Revision: 3920 http://fudaa.svn.sourceforge.net/fudaa/?rev=3920&view=rev Author: hadouxad Date: 2008-09-13 20:37:51 +0000 (Sat, 13 Sep 2008) Log Message: ----------- COrrection bugs - action configurer: delegue toujours a son widgetBordure. - cas special legende: Copier/couper: lors de la copie/couper de legende, n enregistre rien pour eviter le plantage. Correction bug wizard courbes temporelles - l'action ajouter en cliquant sur la ligene de la cellule vide - action supprimer: qui supprime les points saisis - action modifs: en double cliquant sur les cellules (cf setValueAt) - s'il n'y a pas de graphe dispo, l'option cr?\195?\169e un nouveau graphe doit etre coch?\195?\169e et disable ( l'utilisateur n'a pas le choix...) - Bug bizarre lors de la saisie de certains points pour les courbes temporelles... FONCTION AJOUT COURBE SOURCE OK!! - Fonction clic droit sur courbe du graphe FONCTIONNE! - methode TrPostCourbeTreeModel.duplicateWithChooseSrc() - Il fallait initialiser le tableau des y en recuperant la taille du y de son duplicata - utilsier la methode update - GESTION DE TOUS LEs CAS (tentative) - creation courbe REELLE sur nouveau src depuis courbe REELLE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe REELLE ancien source - creation courbe REELLE sur nouveau src depuis courbe INTERPOLEE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe INTERPOLEE ancien source Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeBuilder.java Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeBuilder.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeBuilder.java 2008-09-13 20:37:17 UTC (rev 3919) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostCourbeBuilder.java 2008-09-13 20:37:51 UTC (rev 3920) @@ -27,14 +27,14 @@ public final class TrPostCourbeBuilder { private TrPostCourbeBuilder() {} - public static TrPostCourbeTreeModel build(final FudaaCommonImplementation _impl, final TrPostSource _src, + public static TrPostCourbeTreeModel build(TrPostProjet projet, final TrPostSource _src, final int[] _tidx, final H2dVariableType[] _vars, final int[] _idxPtArray, final ProgressionInterface _prog) { if (_prog != null) { _prog.setDesc(TrResource.getS("Construction des courbes")); } - final TrPostCourbeTreeModel treeModel = new TrPostCourbeTreeModel(_impl, _src, /* - * _tidx, - */_idxPtArray, _vars); + final TrPostCourbeTreeModel treeModel = new TrPostCourbeTreeModel(projet.impl_, _src, /* + * _tidx, + */_idxPtArray, _vars, projet); treeModel.addAllCourbes(_prog, null); return treeModel; @@ -57,13 +57,14 @@ return new EvolutionReguliere(times, values, true); } - public static TrPostCourbeTreeModel build(final FudaaCommonImplementation _impl, final TrPostSource _src, + public static TrPostCourbeTreeModel build(final TrPostProjet projet, final TrPostSource _src, final int[] _tidx, final H2dVariableType[] _vars, final TrPostInterpolatePoint _idxPtArray, final ProgressionInterface _prog) { if (_prog != null) { _prog.setDesc(TrResource.getS("Construction des courbes")); } - final TrPostCourbeTreeModel treeModel = new TrPostCourbeTreeModel(_impl, _src, _tidx, _idxPtArray, _vars); + final TrPostCourbeTreeModel treeModel = new TrPostCourbeTreeModel(projet.impl_, _src, _tidx, _idxPtArray, _vars, + projet); treeModel.addAllCourbes(_prog, null); return treeModel; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <had...@us...> - 2008-09-13 20:37:07
|
Revision: 3919 http://fudaa.svn.sourceforge.net/fudaa/?rev=3919&view=rev Author: hadouxad Date: 2008-09-13 20:37:17 +0000 (Sat, 13 Sep 2008) Log Message: ----------- COrrection bugs - action configurer: delegue toujours a son widgetBordure. - cas special legende: Copier/couper: lors de la copie/couper de legende, n enregistre rien pour eviter le plantage. Correction bug wizard courbes temporelles - l'action ajouter en cliquant sur la ligene de la cellule vide - action supprimer: qui supprime les points saisis - action modifs: en double cliquant sur les cellules (cf setValueAt) - s'il n'y a pas de graphe dispo, l'option cr?\195?\169e un nouveau graphe doit etre coch?\195?\169e et disable ( l'utilisateur n'a pas le choix...) - Bug bizarre lors de la saisie de certains points pour les courbes temporelles... FONCTION AJOUT COURBE SOURCE OK!! - Fonction clic droit sur courbe du graphe FONCTIONNE! - methode TrPostCourbeTreeModel.duplicateWithChooseSrc() - Il fallait initialiser le tableau des y en recuperant la taille du y de son duplicata - utilsier la methode update - GESTION DE TOUS LEs CAS (tentative) - creation courbe REELLE sur nouveau src depuis courbe REELLE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe REELLE ancien source - creation courbe REELLE sur nouveau src depuis courbe INTERPOLEE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe INTERPOLEE ancien source Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionAddPointFromWidgetCalque.java Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionAddPointFromWidgetCalque.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionAddPointFromWidgetCalque.java 2008-09-13 20:36:45 UTC (rev 3918) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrPostActionAddPointFromWidgetCalque.java 2008-09-13 20:37:17 UTC (rev 3919) @@ -471,6 +471,16 @@ } + public void setEnabled(boolean enabled) { + if (this.boxCalques_ != null) + this.boxCalques_.setEnabled(enabled); + this.jlisteGraphesChoix.setEnabled(enabled); + this.jlisteGraphesSelections.setEnabled(enabled); + this.select.setEnabled(enabled); + this.unselect.setEnabled(enabled); + + } + public abstract void setTitleForFrame(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <had...@us...> - 2008-09-13 20:36:34
|
Revision: 3918 http://fudaa.svn.sourceforge.net/fudaa/?rev=3918&view=rev Author: hadouxad Date: 2008-09-13 20:36:45 +0000 (Sat, 13 Sep 2008) Log Message: ----------- COrrection bugs - action configurer: delegue toujours a son widgetBordure. - cas special legende: Copier/couper: lors de la copie/couper de legende, n enregistre rien pour eviter le plantage. Correction bug wizard courbes temporelles - l'action ajouter en cliquant sur la ligene de la cellule vide - action supprimer: qui supprime les points saisis - action modifs: en double cliquant sur les cellules (cf setValueAt) - s'il n'y a pas de graphe dispo, l'option cr?\195?\169e un nouveau graphe doit etre coch?\195?\169e et disable ( l'utilisateur n'a pas le choix...) - Bug bizarre lors de la saisie de certains points pour les courbes temporelles... FONCTION AJOUT COURBE SOURCE OK!! - Fonction clic droit sur courbe du graphe FONCTIONNE! - methode TrPostCourbeTreeModel.duplicateWithChooseSrc() - Il fallait initialiser le tableau des y en recuperant la taille du y de son duplicata - utilsier la methode update - GESTION DE TOUS LEs CAS (tentative) - creation courbe REELLE sur nouveau src depuis courbe REELLE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe REELLE ancien source - creation courbe REELLE sur nouveau src depuis courbe INTERPOLEE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe INTERPOLEE ancien source Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java 2008-09-13 20:21:07 UTC (rev 3917) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLayerDefault.java 2008-09-13 20:36:45 UTC (rev 3918) @@ -249,6 +249,24 @@ return sondeSelectionLong(_prReel, _model); } + + /** + * Recherche le point qui peut contenir la sonde pour bien initialiser la var. + * + * @param _prReel + * @param grid + * @return + */ + public static int sondeSelection(final GrPoint _prReel, final EfGridInterface grid) { + + if (grid.getIndex() != null) { + final EfIndexVisitorNearestElt visitor = new EfIndexVisitorNearestElt(grid, _prReel.x_, _prReel.y_, 0); + grid.getIndex().query(EfIndexVisitorNearestNode.getEnvelope(_prReel.x_, _prReel.y_, 0), visitor); + return visitor.isIn() ? visitor.getSelected() : -1; + } + return -1; + } + private static int sondeSelectionLong(final GrPoint _prReel, final TrPostModelInterface _model) { final GrPolygone poly = new GrPolygone(); for (int i = _model.getNbElt() - 1; i >= 0; i--) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <had...@us...> - 2008-09-13 20:20:56
|
Revision: 3917 http://fudaa.svn.sourceforge.net/fudaa/?rev=3917&view=rev Author: hadouxad Date: 2008-09-13 20:21:07 +0000 (Sat, 13 Sep 2008) Log Message: ----------- COrrection bugs - action configurer: delegue toujours a son widgetBordure. - cas special legende: Copier/couper: lors de la copie/couper de legende, n enregistre rien pour eviter le plantage. Correction bug wizard courbes temporelles - l'action ajouter en cliquant sur la ligene de la cellule vide - action supprimer: qui supprime les points saisis - action modifs: en double cliquant sur les cellules (cf setValueAt) - s'il n'y a pas de graphe dispo, l'option cr?\195?\169e un nouveau graphe doit etre coch?\195?\169e et disable ( l'utilisateur n'a pas le choix...) - Bug bizarre lors de la saisie de certains points pour les courbes temporelles... FONCTION AJOUT COURBE SOURCE OK!! - Fonction clic droit sur courbe du graphe FONCTIONNE! - methode TrPostCourbeTreeModel.duplicateWithChooseSrc() - Il fallait initialiser le tableau des y en recuperant la taille du y de son duplicata - utilsier la methode update - GESTION DE TOUS LEs CAS (tentative) - creation courbe REELLE sur nouveau src depuis courbe REELLE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe REELLE ancien source - creation courbe REELLE sur nouveau src depuis courbe INTERPOLEE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe INTERPOLEE ancien source Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayerModel.java Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayerModel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayerModel.java 2008-09-13 20:18:07 UTC (rev 3916) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/rubar/TrRubarOuvrageLayerModel.java 2008-09-13 20:21:07 UTC (rev 3917) @@ -10,18 +10,12 @@ import javax.swing.table.AbstractTableModel; import javax.swing.table.TableColumnModel; -import com.vividsolutions.jts.geom.Coordinate; - -import com.memoire.bu.BuResource; -import com.memoire.bu.BuTable; - import org.fudaa.ctulu.CtuluCommandContainer; import org.fudaa.ctulu.CtuluLib; import org.fudaa.ctulu.CtuluLibString; import org.fudaa.ctulu.CtuluListSelectionInterface; import org.fudaa.ctulu.gui.CtuluCellTextRenderer; import org.fudaa.ctulu.gui.CtuluTable; - import org.fudaa.dodico.ef.EfElementVolume; import org.fudaa.dodico.ef.EfGridVolumeInterface; import org.fudaa.dodico.ef.EfSegment; @@ -32,20 +26,22 @@ import org.fudaa.dodico.h2d.rubar.H2dRubarOuvrageI; import org.fudaa.dodico.h2d.rubar.H2dRubarOuvrageMng; import org.fudaa.dodico.h2d.rubar.H2dRubarParameters; - import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface; import org.fudaa.ebli.commun.EbliTableInfoPanel; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.geometrie.GrPolygone; import org.fudaa.ebli.geometrie.GrSegment; import org.fudaa.ebli.palette.BPaletteInfo.InfoData; - import org.fudaa.fudaa.commun.FudaaLib; import org.fudaa.fudaa.meshviewer.MvResource; import org.fudaa.fudaa.meshviewer.model.MvElementModelDefault; import org.fudaa.fudaa.tr.common.TrResource; import org.fudaa.fudaa.tr.data.TrInfoSenderDelegate; +import com.memoire.bu.BuResource; +import com.memoire.bu.BuTable; +import com.vividsolutions.jts.geom.Coordinate; + /** * @author Fred Deniger * @version $Id: TrRubarOuvrageLayerModel.java,v 1.27 2007-05-04 14:01:53 deniger Exp $ @@ -194,7 +190,7 @@ mng_ = _mng; } - protected EfGridVolumeInterface getG() { + public EfGridVolumeInterface getG() { return (EfGridVolumeInterface) super.g_; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <had...@us...> - 2008-09-13 20:17:57
|
Revision: 3916 http://fudaa.svn.sourceforge.net/fudaa/?rev=3916&view=rev Author: hadouxad Date: 2008-09-13 20:18:07 +0000 (Sat, 13 Sep 2008) Log Message: ----------- COrrection bugs - action configurer: delegue toujours a son widgetBordure. - cas special legende: Copier/couper: lors de la copie/couper de legende, n enregistre rien pour eviter le plantage. Correction bug wizard courbes temporelles - l'action ajouter en cliquant sur la ligene de la cellule vide - action supprimer: qui supprime les points saisis - action modifs: en double cliquant sur les cellules (cf setValueAt) - s'il n'y a pas de graphe dispo, l'option cr?\195?\169e un nouveau graphe doit etre coch?\195?\169e et disable ( l'utilisateur n'a pas le choix...) - Bug bizarre lors de la saisie de certains points pour les courbes temporelles... FONCTION AJOUT COURBE SOURCE OK!! - Fonction clic droit sur courbe du graphe FONCTIONNE! - methode TrPostCourbeTreeModel.duplicateWithChooseSrc() - Il fallait initialiser le tableau des y en recuperant la taille du y de son duplicata - utilsier la methode update - GESTION DE TOUS LEs CAS (tentative) - creation courbe REELLE sur nouveau src depuis courbe REELLE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe REELLE ancien source - creation courbe REELLE sur nouveau src depuis courbe INTERPOLEE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe INTERPOLEE ancien source Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/tr/common/tr_en.fr_txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <had...@us...> - 2008-09-13 20:17:15
|
Revision: 3915 http://fudaa.svn.sourceforge.net/fudaa/?rev=3915&view=rev Author: hadouxad Date: 2008-09-13 20:17:25 +0000 (Sat, 13 Sep 2008) Log Message: ----------- COrrection bugs - action configurer: delegue toujours a son widgetBordure. - cas special legende: Copier/couper: lors de la copie/couper de legende, n enregistre rien pour eviter le plantage. Correction bug wizard courbes temporelles - l'action ajouter en cliquant sur la ligene de la cellule vide - action supprimer: qui supprime les points saisis - action modifs: en double cliquant sur les cellules (cf setValueAt) - s'il n'y a pas de graphe dispo, l'option cr?\195?\169e un nouveau graphe doit etre coch?\195?\169e et disable ( l'utilisateur n'a pas le choix...) - Bug bizarre lors de la saisie de certains points pour les courbes temporelles... FONCTION AJOUT COURBE SOURCE OK!! - Fonction clic droit sur courbe du graphe FONCTIONNE! - methode TrPostCourbeTreeModel.duplicateWithChooseSrc() - Il fallait initialiser le tableau des y en recuperant la taille du y de son duplicata - utilsier la methode update - GESTION DE TOUS LEs CAS (tentative) - creation courbe REELLE sur nouveau src depuis courbe REELLE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe REELLE ancien source - creation courbe REELLE sur nouveau src depuis courbe INTERPOLEE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe INTERPOLEE ancien source Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/model/MvElementModelDefault.java Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java 2008-09-13 20:14:57 UTC (rev 3914) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java 2008-09-13 20:17:25 UTC (rev 3915) @@ -22,6 +22,10 @@ private double[] time_; + public double[] getTime() { + return time_; + } + CtuluRange yRange_; protected String nom_; @@ -56,7 +60,7 @@ } } - protected double[] getY() { + public double[] getY() { return y_; } Modified: branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/model/MvElementModelDefault.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/model/MvElementModelDefault.java 2008-09-13 20:14:57 UTC (rev 3914) +++ branches/Prepro-0.92-SNAPSHOT/fudaa/src/org/fudaa/fudaa/meshviewer/model/MvElementModelDefault.java 2008-09-13 20:17:25 UTC (rev 3915) @@ -11,15 +11,11 @@ import javax.swing.table.AbstractTableModel; -import com.memoire.bu.BuTable; - import org.fudaa.ctulu.CtuluLibString; import org.fudaa.ctulu.gui.CtuluTable; - import org.fudaa.dodico.ef.EfElement; import org.fudaa.dodico.ef.EfGridInterface; import org.fudaa.dodico.ef.impl.EfGrid; - import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface; import org.fudaa.ebli.calque.ZModeleDonnesAbstract; import org.fudaa.ebli.commun.EbliTableInfoPanel; @@ -28,10 +24,11 @@ import org.fudaa.ebli.geometrie.GrPoint; import org.fudaa.ebli.geometrie.GrPolygone; import org.fudaa.ebli.palette.BPaletteInfo.InfoData; - import org.fudaa.fudaa.commun.FudaaLib; import org.fudaa.fudaa.meshviewer.MvResource; +import com.memoire.bu.BuTable; + /** * @author Fred Deniger * @version $Id: MvElementModelDefault.java,v 1.1 2007-01-19 13:14:18 deniger Exp $ @@ -88,6 +85,10 @@ protected EfGridInterface g_; + public EfGridInterface getG() { + return g_; + } + public MvElementModelDefault(final EfGridInterface _g) { this(_g, null); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <had...@us...> - 2008-09-13 20:14:47
|
Revision: 3914 http://fudaa.svn.sourceforge.net/fudaa/?rev=3914&view=rev Author: hadouxad Date: 2008-09-13 20:14:57 +0000 (Sat, 13 Sep 2008) Log Message: ----------- COrrection bugs - action configurer: delegue toujours a son widgetBordure. - cas special legende: Copier/couper: lors de la copie/couper de legende, n enregistre rien pour eviter le plantage. Correction bug wizard courbes temporelles - l'action ajouter en cliquant sur la ligene de la cellule vide - action supprimer: qui supprime les points saisis - action modifs: en double cliquant sur les cellules (cf setValueAt) - s'il n'y a pas de graphe dispo, l'option cr?\195?\169e un nouveau graphe doit etre coch?\195?\169e et disable ( l'utilisateur n'a pas le choix...) - Bug bizarre lors de la saisie de certains points pour les courbes temporelles... FONCTION AJOUT COURBE SOURCE OK!! - Fonction clic droit sur courbe du graphe FONCTIONNE! - methode TrPostCourbeTreeModel.duplicateWithChooseSrc() - Il fallait initialiser le tableau des y en recuperant la taille du y de son duplicata - utilsier la methode update - GESTION DE TOUS LEs CAS (tentative) - creation courbe REELLE sur nouveau src depuis courbe REELLE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe REELLE ancien source - creation courbe REELLE sur nouveau src depuis courbe INTERPOLEE ancien source - creation courbe INTERPOLEE sur nouveau src depuis courbe INTERPOLEE ancien source Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbe.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheModel.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheSimpleModel.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheTreeModel.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGSpecificActions.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/CommandUndoRedoPaste.java Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbe.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbe.java 2008-09-12 12:48:33 UTC (rev 3913) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGCourbe.java 2008-09-13 20:14:57 UTC (rev 3914) @@ -68,6 +68,8 @@ private boolean markMinLine_; + + private EGModel model_; private TraceLigneModel tLigneMarqueur_; Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheModel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheModel.java 2008-09-12 12:48:33 UTC (rev 3913) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheModel.java 2008-09-13 20:14:57 UTC (rev 3914) @@ -141,7 +141,15 @@ */ void duplicateCourbe(CtuluCommandManager _mng, EGCourbe _c); + /** + * Dupliquer la courbe pour les sources choisis + * + * @param _mng + * @param _c + */ + void duplicateCourbeForSrc(CtuluCommandManager _mng, EGCourbe _c); + /** * methode qui permet de dupliquer les models de courbe * @param _duplicator TODO */ Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheSimpleModel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheSimpleModel.java 2008-09-12 12:48:33 UTC (rev 3913) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheSimpleModel.java 2008-09-13 20:14:57 UTC (rev 3914) @@ -20,6 +20,7 @@ import javax.swing.ComboBoxModel; import javax.swing.DefaultListSelectionModel; import javax.swing.JComboBox; +import javax.swing.JOptionPane; import javax.swing.ListSelectionModel; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableModel; @@ -497,6 +498,13 @@ } } + + public void duplicateCourbeForSrc(CtuluCommandManager _mng, EGCourbe _c) { + + JOptionPane.showMessageDialog(null, "ne gere pas le multi source "); + duplicateCourbe(_mng,_c); + } + public void enDernier(final EGObject _o) { final int i = element_.indexOf(_o); Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheTreeModel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheTreeModel.java 2008-09-12 12:48:33 UTC (rev 3913) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGGrapheTreeModel.java 2008-09-13 20:14:57 UTC (rev 3914) @@ -777,7 +777,38 @@ } } } + + public void duplicateCourbeForSrc(final CtuluCommandManager _mng, final EGCourbe _c) { + + + + final EGCourbeChild child = (EGCourbeChild) _c; + final EGGroup g = child.getParentGroup(); + final int i = g.getIndex(child); + if (i >= 0) { + final EGCourbeChild cDuplicate = duplicateWithChooseSrc(child); + if (cDuplicate != null) { + g.addEGComponent(cDuplicate); + // g.addEGComponent(cDuplicate, i + 1); + curvesAdded(cDuplicate, _mng); + } + } + } + + /** + * methode qui demande a l user de choisir sa courbe puis genere une copie + * avec la source en cours. + * + * @param _child + * @return + */ + protected EGCourbeChild duplicateWithChooseSrc(EGCourbeChild _child) { + + return null; + } + + public void enDernier(final EGObject _o) { final List r = getGrapheTreeNode().components_; final int i = r.indexOf(_o); Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java 2008-09-12 12:48:33 UTC (rev 3913) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGModel.java 2008-09-13 20:14:57 UTC (rev 3914) @@ -22,7 +22,7 @@ * @return true si ce modele peut-etre enleve */ boolean isRemovable(); - + /** * @return true si peut etre dupliqu\xE9. En general, renvoie true. */ Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGSpecificActions.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGSpecificActions.java 2008-09-12 12:48:33 UTC (rev 3913) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/courbe/EGSpecificActions.java 2008-09-13 20:14:57 UTC (rev 3914) @@ -13,18 +13,17 @@ import javax.swing.JTextField; -import com.memoire.bu.BuResource; -import com.memoire.bu.BuSeparator; - import org.fudaa.ctulu.CtuluCommandManager; import org.fudaa.ctulu.CtuluLib; import org.fudaa.ctulu.CtuluResource; import org.fudaa.ctulu.gui.CtuluDialogPanel; import org.fudaa.ctulu.gui.CtuluPopupMenu; - import org.fudaa.ebli.commun.EbliLib; import org.fudaa.ebli.ressource.EbliResource; +import com.memoire.bu.BuResource; +import com.memoire.bu.BuSeparator; + /** * @author Fred Deniger * @version $Id: EGSpecificActions.java,v 1.16 2007-05-04 13:49:41 deniger Exp $ @@ -55,6 +54,10 @@ return "DERNIER"; } + private static String getCopieSrc() { + return "COPIESRC"; + } + private static String getActDown() { return "DESCENDRE"; } @@ -109,7 +112,15 @@ canDescendre, this); menu_.addMenuItem(EbliResource.EBLI.getString("En dernier"), getActLast(), EbliResource.EBLI.getIcon("endernier"), canDescendre, this); + + menu_.addMenuItem(EbliResource.EBLI.getString("Copier la courbe pour un autre jeu de donn\xE9es"), getCopieSrc(), + EbliResource.EBLI.getIcon("crystal_copier"), true, this); + } + + + + menu_.show(_evt.getComponent(), _evt.getX(), _evt.getY()); } @@ -141,7 +152,10 @@ target_.getModel().duplicateCourbe(cmd_, target_.getSelectedComponent()); } } + else if ("COPIESRC".equals(com)) { + target_.getModel().duplicateCourbeForSrc(cmd_, target_.getSelectedComponent()); + } else if ("VISIBLE".equals(com)) { if (n != 1) { return; Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java 2008-09-12 12:48:33 UTC (rev 3913) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetController.java 2008-09-13 20:14:57 UTC (rev 3914) @@ -294,8 +294,13 @@ public void actionPerformed(ActionEvent e) { - EbliWidget found = widget_; + EbliWidget found = null;// widget_; + if (widget_.getParentWidget() != null && widget_.getParentWidget() instanceof EbliWidgetBordure) + found = (EbliWidget) widget_.getParentWidget(); + else + found = widget_; + BConfigurePalette palette = new BConfigurePalette(false); BConfigurableComposite cmp = WidgetConfigure.configurePalette(found); Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/CommandUndoRedoPaste.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/CommandUndoRedoPaste.java 2008-09-12 12:48:33 UTC (rev 3913) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/actions/CommandUndoRedoPaste.java 2008-09-13 20:14:57 UTC (rev 3914) @@ -23,6 +23,7 @@ // le node existe toujours apres l'avoir enleve node.getWidget().getEbliScene().addNode(node); } + if (nodesPasted_.iterator().hasNext()) nodesPasted_.iterator().next().getWidget().getEbliScene().refresh(); } @@ -35,6 +36,7 @@ // le node existe toujours apres l'avoir enleve node.getWidget().getEbliScene().removeNode(node); } + if (nodesPasted_.iterator().hasNext()) nodesPasted_.iterator().next().getWidget().getEbliScene().refresh(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bma...@us...> - 2008-09-12 07:56:04
|
Revision: 3912 http://fudaa.svn.sourceforge.net/fudaa/?rev=3912&view=rev Author: bmarchan Date: 2008-09-12 07:56:15 +0000 (Fri, 12 Sep 2008) Log Message: ----------- Optimisation du traiment de d?\195?\169placement/rotation des points d'un semis. Modified Paths: -------------- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueMultiPoint.java branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueMultiPoint.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueMultiPoint.java 2008-09-11 22:20:32 UTC (rev 3911) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueMultiPoint.java 2008-09-12 07:56:15 UTC (rev 3912) @@ -32,6 +32,7 @@ import org.fudaa.ctulu.CtuluListSelection; import org.fudaa.ctulu.CtuluListSelectionInterface; import org.fudaa.ctulu.gis.GISAttributeInterface; +import org.fudaa.ctulu.gis.GISCoordinateSequenceContainerInterface; import org.fudaa.ctulu.gis.GISGeometryFactory; import org.fudaa.ctulu.gis.GISLib; import org.fudaa.ctulu.gis.GISZoneCollection; @@ -310,15 +311,17 @@ final Envelope env = new Envelope(); if (isAtomicMode_) { final EbliListeSelectionMultiInterface multi = getLayerSelectionMulti(); + Coordinate c=new Coordinate(); final TIntObjectIterator it = multi.getIterator(); for (int i = multi.getNbListSelected(); i-- > 0;) { it.advance(); final CtuluListSelectionInterface atomSel = (CtuluListSelectionInterface) it.value(); - final Geometry g = (Geometry) modele_.getGeomData().getGeometry(it.key()); + final CoordinateSequence seq = modele_.getGeomData().getCoordinateSequence(it.key()); final int max = atomSel.getMaxIndex(); for (int j = atomSel.getMinIndex(); j <= max; j++) { if (atomSel.isSelected(j)) { - env.expandToInclude(g.getCoordinates()[j]); + seq.getCoordinate(j,c); + env.expandToInclude(c); } } } Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java =================================================================== --- branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java 2008-09-11 22:20:32 UTC (rev 3911) +++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ebli/src/org/fudaa/ebli/calque/edition/ZModeleMultiPointEditable.java 2008-09-12 07:56:15 UTC (rev 3912) @@ -338,7 +338,8 @@ return 0; } final Geometry gi = geometries_.getGeometry(_idxLigne); - return gi.getNumPoints(); + return gi.getNumGeometries(); +// return gi.getNumPoints(); } public final int getNombre() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <de...@us...> - 2008-09-11 22:20:23
|
Revision: 3911 http://fudaa.svn.sourceforge.net/fudaa/?rev=3911&view=rev Author: deniger Date: 2008-09-11 22:20:32 +0000 (Thu, 11 Sep 2008) Log Message: ----------- Modified Paths: -------------- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java Modified: branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java =================================================================== --- branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java 2008-09-11 22:14:11 UTC (rev 3910) +++ branches/Prepro-0.92-SNAPSHOT/ebli/src/org/fudaa/ebli/visuallibrary/EbliWidgetTextEditor.java 2008-09-11 22:20:32 UTC (rev 3911) @@ -1,7 +1,6 @@ package org.fudaa.ebli.visuallibrary; import java.awt.Dimension; -import java.awt.Graphics2D; import java.awt.Rectangle; import java.util.EnumSet; @@ -65,25 +64,25 @@ * de l editeur html * @param g */ - public void decoupeEcriture(String text, Graphics2D g) { - - int espaceLignes = 10; - - if(text==null || text.length()==0) - return; - - Rectangle rec = getClientArea(); - int indiceDep=0; - int espaceAffichable = Math.min((int) (rec.width / 5), text.length()); - - for (int i = 0; indiceDep + espaceAffichable < text.length(); i++) { - g.drawString(text.substring(indiceDep, indiceDep + espaceAffichable), rec.x, rec.y + i * espaceLignes); - indiceDep = indiceDep + espaceAffichable; - - } - - - } +// public void decoupeEcriture(String text, Graphics2D g) { +// +// int espaceLignes = 10; +// +// if(text==null || text.length()==0) +// return; +// +// Rectangle rec = getClientArea(); +// int indiceDep=0; +// int espaceAffichable = Math.min((int) (rec.width / 5), text.length()); +// +// for (int i = 0; indiceDep + espaceAffichable < text.length(); i++) { +// g.drawString(text.substring(indiceDep, indiceDep + espaceAffichable), rec.x, rec.y + i * espaceLignes); +// indiceDep = indiceDep + espaceAffichable; +// +// } +// +// +// } public BuPanel createEditorComponent( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |