Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8595] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2014-02-03 10:42:57
|
Revision: 8595
http://sourceforge.net/p/fudaa/svn/8595
Author: deniger
Date: 2014-02-03 10:42:53 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
CRUE-594, CRUE-604
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu40.java
trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java
trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu50.java
trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu70.java
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-0.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-1.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-2.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-3.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-4.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-5.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-0.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-1.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu5-0.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu6-0.zip
trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-0.zip
trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java
trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml
trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ScenarioBuilderForTests.java
trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CloseProjectAction.java
Added Paths:
-----------
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/modules/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/modules/options/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/modules/options/keymap/
trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/modules/options/keymap/Bundle_fr_FR.properties
Modified: trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties
===================================================================
--- trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/crue-core/src/main/resources/org/fudaa/dodico/crue/common/businessMessages.properties 2014-02-03 10:42:53 UTC (rev 8595)
@@ -892,8 +892,8 @@
externConfig.geo.NoFormatFound.error=Ressource {0}: le format du fichier n''est pas pr\u00e9sent dans le fichier
externConfig.geo.FormatUnknown.error=Ressource {0}: le format {1} du fichier n''est pas support\u00e9 par Fudaa-Crue
externConfig.geo.NoDataFound.error=Ressource {0}: le fichier {1} ne contient pas de donn\u00e9es ou est erron\u00e9
-create.SectionAval={0}_Aval
-create.SectionAmont={0}_Amont
+create.SectionAval={0}_Av
+create.SectionAmont={0}_Am
deleteEMH.SectionUsedByBranche.Title=Des sections ne sont pas supprim\u00e9es car utilis\u00e9es par des branches
deleteEMH.SectionUsedByBranche.Item=La section {0} est utilis\u00e9e par une branche
deleteEMH.SectionUsedBySectionIdem.Title=Des sections ne sont pas supprim\u00e9es car r\u00e9f\u00e9renc\u00e9es par des SectionIdem
Modified: trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java
===================================================================
--- trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/crue-io/src/main/java/org/fudaa/dodico/crue/io/neuf/DCFileReader.java 2014-02-03 10:42:53 UTC (rev 8595)
@@ -301,11 +301,11 @@
final EMHSectionSansGeometrie amont = new EMHSectionSansGeometrie(CruePrefix.changePrefix(branche.getNom(),
CruePrefix.P_BRANCHE,
CruePrefix.P_SECTION)
- + "_Amont");
+ + "_Am");
final EMHSectionSansGeometrie aval = new EMHSectionSansGeometrie(CruePrefix.changePrefix(branche.getNom(),
CruePrefix.P_BRANCHE,
CruePrefix.P_SECTION)
- + "_Aval");
+ + "_Av");
metier.add(amont);
metier.add(aval);
branche.addListeSections(Arrays.asList(EMHRelationFactory.createSectionDansBrancheAndSetBrancheContientSection(branche, amont, 0,
Modified: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu40.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu40.java 2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu40.java 2014-02-03 10:42:53 UTC (rev 8595)
@@ -45,26 +45,26 @@
@Test
public void testSc_M40_c9c9() {
IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M4-0_c9", "Sc_M4-0_c9c9", "M4-0_c9c9", true, 0);
- IntegrationHelper.testScenario(projet, "Sc_M4-0_c9c9", new ErrorBilanTester(0, 0, 4, 2));
+ IntegrationHelper.testScenario(projet, "Sc_M4-0_c9c9", new ErrorBilanTester(0, 0, 3, 2));
}
@Test
public void testSc_M40_c10c9() {
IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M4-0_c10", "Sc_M4-0_c10c9", "M4-0_c10c9",
Arrays.asList("COM5", "COM1", "COM3", "DLHY1", "DCLM4", "PNUM1", "OPTR1"));
- IntegrationHelper.testScenario(projet, "Sc_M4-0_c10c9", new ErrorBilanTester(0, 0, 4, 2));
+ IntegrationHelper.testScenario(projet, "Sc_M4-0_c10c9", new ErrorBilanTester(0, 0, 3, 2));
}
@Test
public void testSc_M40_c10c10() {
IntegrationHelper.exportToCrue10(getEtuFile().getParentFile(), projet, "Sc_M4-0_c10", "Sc_M4-0_c10c10", "M4-0_c10c10", true, 0);
- IntegrationHelper.testScenario(projet, "Sc_M4-0_c10c10", new ErrorBilanTester(0, 0, 3, 1));
+ IntegrationHelper.testScenario(projet, "Sc_M4-0_c10c10", new ErrorBilanTester(0, 0, 2, 1));
}
@Test
public void testSc_Poub_c10() {
IntegrationHelper.exportToCrue10(getEtuFile().getParentFile(), projet, "Sc_M4-0_c10", "Sc_Poub_c10", "Poub_c10", true, 0);
- IntegrationHelper.testScenario(projet, "Sc_Poub_c10", new ErrorBilanTester(0, 0, 3, 1));
+ IntegrationHelper.testScenario(projet, "Sc_Poub_c10", new ErrorBilanTester(0, 0, 2, 1));
}
@Test
@@ -74,17 +74,17 @@
"COM5", "OCAL4",
"OPTI6", "OPTG4",
"OPTR1"));// différences
- IntegrationHelper.testScenario(projet, "Sc_M4-0_c9c10", new ErrorBilanTester(0, 0, 3, 2));
+ IntegrationHelper.testScenario(projet, "Sc_M4-0_c9c10", new ErrorBilanTester(0, 0, 2, 2));
}
@Test
public void testSc_M40_c9() {
- IntegrationHelper.testScenario(projet, "Sc_M4-0_c9", new ErrorBilanTester(0, 0, 4, 2));
+ IntegrationHelper.testScenario(projet, "Sc_M4-0_c9", new ErrorBilanTester(0, 0, 3, 2));
}
@Test
public void testSc_M40_v1c9() {
- IntegrationHelper.testScenario(projet, "Sc_M4-0_v1c9", new ErrorBilanTester(0, 0, 4, 1));
+ IntegrationHelper.testScenario(projet, "Sc_M4-0_v1c9", new ErrorBilanTester(0, 0, 3, 1));
}
@Test
@@ -94,12 +94,12 @@
@Test
public void testSc_M40_c10() {
- IntegrationHelper.testScenario(projet, "Sc_M4-0_c10", new ErrorBilanTester(0, 0, 3, 1));
+ IntegrationHelper.testScenario(projet, "Sc_M4-0_c10", new ErrorBilanTester(0, 0, 2, 1));
}
@Test
public void testSc_M40_v1c10() {
- IntegrationHelper.testScenario(projet, "Sc_M4-0_v1c10", new ErrorBilanTester(0, 0, 3, 1));
+ IntegrationHelper.testScenario(projet, "Sc_M4-0_v1c10", new ErrorBilanTester(0, 0, 2, 1));
}
private File getEtuFile() {
Modified: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java 2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu41.java 2014-02-03 10:42:53 UTC (rev 8595)
@@ -51,7 +51,7 @@
@Test
public void testSc_Poub_c9() {
IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M4-1_c9", "Sc_Poub_c9", "Poub_c9", true, 0);
- IntegrationHelper.testScenario(projet, "Sc_Poub_c9", new ErrorBilanTester(0, 0, 6, 2));
+ IntegrationHelper.testScenario(projet, "Sc_Poub_c9", new ErrorBilanTester(0, 0, 5, 2));
}
@Test
Modified: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu50.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu50.java 2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu50.java 2014-02-03 10:42:53 UTC (rev 8595)
@@ -46,13 +46,13 @@
public void testSc_M50_c10c9() {
IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M5-0_c10", "Sc_M5-0_c10c9", "M5-0_c10c9",
Arrays.asList("COM1", "COM3", "COM5", "PNUM1", "OPTR1"));
- IntegrationHelper.testScenario(projet, "Sc_M5-0_c10c9", new ErrorBilanTester(0, 0, 7, 1));
+ IntegrationHelper.testScenario(projet, "Sc_M5-0_c10c9", new ErrorBilanTester(0, 0, 5, 1));
}
@Test
public void testSc_M50_c9c9() {
IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M5_c9", "Sc_M5_c9c9", "M5_c9c9", true, 0);
- IntegrationHelper.testScenario(projet, "Sc_M5_c9c9", new ErrorBilanTester(0, 0, 7, 1));
+ IntegrationHelper.testScenario(projet, "Sc_M5_c9c9", new ErrorBilanTester(0, 0, 5, 1));
}
@Test
@@ -61,13 +61,13 @@
"COM5", "OCAL4",
"OPTI6", "OPTG4",
"OPTR1"));// différences
- IntegrationHelper.testScenario(projet, "Sc_M5-0_c9c10", new ErrorBilanTester(0, 0, 6, 1));
+ IntegrationHelper.testScenario(projet, "Sc_M5-0_c9c10", new ErrorBilanTester(0, 0, 4, 1));
}
@Test
public void testSc_M50_c10c10() {
IntegrationHelper.exportToCrue10(getEtuFile().getParentFile(), projet, "Sc_M5-0_c10", "Sc_M5-0_c10c10", "M5-0_c10c10", true, 0);// différences
- IntegrationHelper.testScenario(projet, "Sc_M5-0_c10c10", new ErrorBilanTester(0, 0, 6, 1));
+ IntegrationHelper.testScenario(projet, "Sc_M5-0_c10c10", new ErrorBilanTester(0, 0, 4, 1));
}
@Test
@@ -75,22 +75,22 @@
IntegrationHelper.exportToCrue10(getEtuFile().getParentFile(), projet, "Sc_M5-0_c9", "Sc_Poub_c10", "Poub_c10", Arrays.asList("COM1", "COM3", "COM5",
"OCAL4", "OPTI6",
"OPTG4", "OPTR1"));// différences
- IntegrationHelper.testScenario(projet, "Sc_Poub_c10", new ErrorBilanTester(0, 0, 6, 1));
+ IntegrationHelper.testScenario(projet, "Sc_Poub_c10", new ErrorBilanTester(0, 0, 4, 1));
}
@Test
public void testSc_M5_c9() {
- IntegrationHelper.testScenario(projet, "Sc_M5_c9", new ErrorBilanTester(0, 0, 7, 1));
+ IntegrationHelper.testScenario(projet, "Sc_M5_c9", new ErrorBilanTester(0, 0, 5, 1));
}
@Test
public void testSc_M50_c9() {
- IntegrationHelper.testScenario(projet, "Sc_M5-0_c9", new ErrorBilanTester(0, 0, 7, 1));
+ IntegrationHelper.testScenario(projet, "Sc_M5-0_c9", new ErrorBilanTester(0, 0, 5, 1));
}
@Test
public void testSc_M50_c10() {
- IntegrationHelper.testScenario(projet, "Sc_M5-0_c10", new ErrorBilanTester(0, 0, 6, 1));
+ IntegrationHelper.testScenario(projet, "Sc_M5-0_c10", new ErrorBilanTester(0, 0, 4, 1));
}
private File getEtuFile() {
Modified: trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu70.java
===================================================================
--- trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu70.java 2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/crue-project/src/test/java/org/fudaa/dodico/crue/integration/TestIntegrationEtu70.java 2014-02-03 10:42:53 UTC (rev 8595)
@@ -46,14 +46,14 @@
public void testSc_M70_c9c9() {
IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M7-0_c9", "Sc_M7-0_c9c9", "M7-0_c9c9", true,
0);
- IntegrationHelper.testScenario(projet, "Sc_M7-0_c9c9", new ErrorBilanTester(0, 0, 261, 0));
+ IntegrationHelper.testScenario(projet, "Sc_M7-0_c9c9", new ErrorBilanTester(0, 0, 249, 0));
}
@Test
public void testSc_M70_c10c9() {
IntegrationHelper.exportToCrue9(getEtuFile().getParentFile(), projet, "Sc_M7-0_c10", "Sc_M7-0_c10c9", "M7-0_c10c9",
Arrays.asList("COM5", "COM1", "COM3", "OPTR1"));
- IntegrationHelper.testScenario(projet, "Sc_M7-0_c10c9", new ErrorBilanTester(0, 0, 261, 0));
+ IntegrationHelper.testScenario(projet, "Sc_M7-0_c10c9", new ErrorBilanTester(0, 0, 249, 0));
}
@Test
@@ -62,23 +62,23 @@
Arrays.asList("COM5", "COM1",
"COM3", "OPTI6",
"OPTG4", "OPTR1"));// différences
- IntegrationHelper.testScenario(projet, "Sc_M7-0_c9c10", new ErrorBilanTester(0, 0, 260, 0));
+ IntegrationHelper.testScenario(projet, "Sc_M7-0_c9c10", new ErrorBilanTester(0, 0, 248, 0));
}
@Test
public void testSc_M70_c10c10() {
IntegrationHelper.exportToCrue10(getEtuFile().getParentFile(), projet, "Sc_M7-0_c10", "Sc_M7-0_c10c10", "M7-0_c10c10", true, 0);
- IntegrationHelper.testScenario(projet, "Sc_M7-0_c10c10", new ErrorBilanTester(0, 0, 260, 0));
+ IntegrationHelper.testScenario(projet, "Sc_M7-0_c10c10", new ErrorBilanTester(0, 0, 248, 0));
}
@Test
public void testSc_M70_c10() {
- IntegrationHelper.testScenario(projet, "Sc_M7-0_c10", new ErrorBilanTester(0, 0, 260, 0));
+ IntegrationHelper.testScenario(projet, "Sc_M7-0_c10", new ErrorBilanTester(0, 0, 248, 0));
}
@Test
public void testSc_M70_c9() {
- IntegrationHelper.testScenario(projet, "Sc_M7-0_c9", new ErrorBilanTester(0, 1, 261, 0));
+ IntegrationHelper.testScenario(projet, "Sc_M7-0_c9", new ErrorBilanTester(0, 1, 249, 0));
}
private File getEtuFile() {
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-0.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-1.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-2.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-3.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-4.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu3-5.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-0.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu4-1.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu5-0.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu6-0.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-project/src/test/resources/integration/v1_1_1/Etu7-0.zip
===================================================================
(Binary files differ)
Modified: trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java
===================================================================
--- trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java 2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/crue-validation/src/test/java/org/fudaa/dodico/crue/validation/TestValidatorForValuesAndContents.java 2014-02-03 10:42:53 UTC (rev 8595)
@@ -55,20 +55,20 @@
assertFalse(log.containsErrorOrSevereError());
ValidationContentSectionDansBrancheExecutor executor = new ValidationContentSectionDansBrancheExecutor(CrueConfigMetierLoaderDefaultTest.DEFAULT);
- executor.validContent(log, pdc, Arrays.asList(new EMHSectionSansGeometrie("Test_Amont"), new EMHSectionSansGeometrie(
- "Test_Aval")));
+ executor.validContent(log, pdc, Arrays.asList(new EMHSectionSansGeometrie("Test_Am"), new EMHSectionSansGeometrie(
+ "Test_Av")));
contents.validateBranche(pdc, new EMHModeleBase(), log);
assertFalse(log.containsErrorOrSevereError());
- executor.validContent(log, pdc, Arrays.asList(new EMHSectionSansGeometrie("Test_Amont"), new EMHSectionSansGeometrie(
- "Test_Amont"),
- new EMHSectionSansGeometrie("Test_Aval")));
+ executor.validContent(log, pdc, Arrays.asList(new EMHSectionSansGeometrie("Test_Am"), new EMHSectionSansGeometrie(
+ "Test_Am"),
+ new EMHSectionSansGeometrie("Test_Av")));
assertTrue(log.containsErrorOrSevereError());
assertEquals(1, log.getRecords().size());
assertEquals("validation.branche.nbSectionNotEqualsTo", log.getRecords().iterator().next().getMsg());
log.clear();
- executor.validContent(log, pdc, Arrays.asList(new EMHSectionIdem("titi"), new EMHSectionSansGeometrie("Test_Amont"),
+ executor.validContent(log, pdc, Arrays.asList(new EMHSectionIdem("titi"), new EMHSectionSansGeometrie("Test_Am"),
new EMHSectionSansGeometrie(
- "Test_Amont"), new EMHSectionSansGeometrie("Test_Aval")));
+ "Test_Am"), new EMHSectionSansGeometrie("Test_Av")));
assertTrue(log.containsErrorOrSevereError());
assertEquals(2, log.getRecords().size());
Iterator<CtuluLogRecord> iterator = log.getRecords().iterator();
@@ -85,8 +85,8 @@
EMHBranchePdc pdc = new EMHBranchePdc("test");
EMHRelationFactory.addRelationContientEMH(sousModele, pdc);
pdc.setUserActive(true);
- final EMHSectionSansGeometrie amont = new EMHSectionSansGeometrie("Test_Amont");
- final EMHSectionSansGeometrie aval = new EMHSectionSansGeometrie("Test_Aval");
+ final EMHSectionSansGeometrie amont = new EMHSectionSansGeometrie("Test_Am");
+ final EMHSectionSansGeometrie aval = new EMHSectionSansGeometrie("Test_Av");
pdc.addListeSections(Arrays.asList(
EMHRelationFactory.createSectionDansBrancheAndSetBrancheContientSection(pdc, amont, 0, EnumPosSection.AMONT,
CrueConfigMetierLoaderDefaultTest.DEFAULT),
Added: trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/modules/options/keymap/Bundle_fr_FR.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/modules/options/keymap/Bundle_fr_FR.properties (rev 0)
+++ trunk/soft/fudaa-crue/ui-branding/src/main/nbm-branding/modules/org-netbeans-modules-options-keymap.jar/org/netbeans/modules/options/keymap/Bundle_fr_FR.properties 2014-02-03 10:42:53 UTC (rev 8595)
@@ -0,0 +1,60 @@
+AD_Add_Shortcut=Ajouter
+AD_Clear=Effacer le raccourci
+AD_Delete=Effacer
+AD_Duplicate=Dupliquer
+AD_Profiles=Profils
+AD_Remove_Shortcut=Supprimer
+AD_Restore=Restaurer
+AD_Shortcut=raccourci
+AD_Shortcuts=Raccourcis
+AD_ShortcutsDialog=Entrer un nouveau raccourci
+AD_Show_Shortcuts=Raccourcis
+AD_Tab=Ins\u00e9rer un caract\u00e8re TAB
+Add_Alternative=Ajouter un raccourci alternatif
+Add_Shortcut_Dialog=Ajouter un raccourci
+Alternative_Shortcut=(raccourci alternatif)
+AN_Add_Shortcut=Ajouter
+AN_Clear=Effacer le raccourci bouton
+AN_Delete=Supprimer
+AN_Duplicate=Dupliquer
+AN_Profiles=Profils
+AN_Remove_Shortcut=Supprimer
+AN_Restore=Restaurer
+AN_Shortcut=Raccourci
+AN_Shortcuts=Raccourcis
+AN_ShortcutsDialog=Entrer un nouveau raccourci
+AN_Show_Shortcuts=Raccourcis
+AN_Tab=Ins\u00e9rer un caract\u00e8re TAB
+Category=Cat\u00e9gorie
+Clear=Effacer
+Conflicting_Shortcut_Dialog=Dialogue des conflits de raccourcis
+CTL_Add_Shortcut=A&jouter ...
+CTL_Clear=&Effacer
+CTL_Create_New_Profile_Message=&Nom du profil:
+CTL_Create_New_Profile_Title=Nouveau profil
+CTL_Delete=Supprimer
+CTL_Duplicate=&Configurer les profiles...
+CTL_Duplicate_Profile_Name=Un profil avec le nom donn\u00e9 existe d\u00e9j\u00e0. Veuillez proposer un autre nom
+CTL_Export_Editor_Shortcuts_Action=Exporter les raccourcis dans un format XML
+CTL_Export_IDE_Actions_Action=Exporter les raccourcis de l'IDE dans un format XML
+CTL_Export_IDE_Shortcuts_Action=Exporter les raccourcis de l'IDE dans un format XML
+CTL_Export_Shortcuts_to_HTML_Action=Exporter les raccourcis dans un format HTML
+CTL_Files=Fichiers
+CTL_Keymap_Name=&Profil:
+CTL_Keymap_Options=&Raccourcis
+CTL_Keymap_Options_Description=Raccourci
+CTL_Keymap_Options_Title=Raccourcis
+CTL_Manage_Keymap_Profiles=Configurer les profils de raccourcis
+CTL_Other=Autre
+CTL_Remove_Shortcut=Supprimer
+CTL_Restore=&Restaurer
+CTL_Shortcuts=&Raccourcis:
+CTL_Show_Shortcuts=&Raccourcis
+Edit=Editer...
+KeymapPanel.searchLabel.text=&Chercher:
+KeymapPanel.searchSCLabel.text=Chercher dans les raccou&rcis:
+Keymaps=&Raccourcis
+Keymaps.Options.Export.Category.displayName=Raccourcis
+ProfilesPanel.profilesList.AccessibleContext.accessibleDescription=Liste des profils de raccourcis clavier
+Reset_to_Default=R\u00e9initialiser
+Shortcut=Raccourci
Modified: trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml
===================================================================
--- trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml 2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/ui-options/src/main/resources/org/fudaa/fudaa/crue/options/layer.xml 2014-02-03 10:42:53 UTC (rev 8595)
@@ -27,7 +27,6 @@
<folder name="OptionsDialog">
<file name="Advanced.instance_hidden"/>
<file name="General.instance_hidden"/>
- <file name="Keymaps.instance_hidden"/>
</folder>
<file name="OptionsExport_hidden"/>
</filesystem>
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ScenarioBuilderForTests.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ScenarioBuilderForTests.java 2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/test/java/org/fudaa/fudaa/crue/planimetry/ScenarioBuilderForTests.java 2014-02-03 10:42:53 UTC (rev 8595)
@@ -109,8 +109,8 @@
}
private static void addSections(EMHSousModele sousModele, CatEMHBranche br, double length, int nbSection) {
- EMHSectionSansGeometrie sectionAmont = new EMHSectionSansGeometrie("St_" + br.getNom() + "_Amont");
- EMHSectionSansGeometrie sectionAval = new EMHSectionSansGeometrie("St_" + br.getNom() + "_Aval");
+ EMHSectionSansGeometrie sectionAmont = new EMHSectionSansGeometrie("St_" + br.getNom() + "_Am");
+ EMHSectionSansGeometrie sectionAval = new EMHSectionSansGeometrie("St_" + br.getNom() + "_Av");
RelationEMHSectionDansBranche sectionAmontRelation = EMHRelationFactory.createSectionDansBrancheAndSetBrancheContientSection(br,
false, sectionAmont,
CrueConfigMetierLoaderDefaultTest.DEFAULT);
Modified: trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CloseProjectAction.java
===================================================================
--- trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CloseProjectAction.java 2014-01-31 20:53:28 UTC (rev 8594)
+++ trunk/soft/fudaa-crue/ui-study/src/main/java/org/fudaa/fudaa/crue/study/actions/CloseProjectAction.java 2014-02-03 10:42:53 UTC (rev 8595)
@@ -13,9 +13,10 @@
import org.openide.awt.ActionRegistration;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
+import org.openide.windows.WindowManager;
@ActionID(category = "View",
-id = "org.fudaa.fudaa.crue.study.actions.CloseStudy")
+ id = "org.fudaa.fudaa.crue.study.actions.CloseStudy")
@ActionRegistration(displayName = "#CloseStudy.Name")
@ActionReferences({
@ActionReference(path = "Actions/Study", position = 10)
@@ -37,5 +38,7 @@
@Override
public void actionPerformed(ActionEvent e) {
crueService.closeAll();
+ WindowManager.getDefault().getMainWindow().repaint(0);
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
