fudaa-svn-commit

[Fudaa-svn-commit] SF.net SVN: fudaa:[9636] branches/fudaa_crue_aoc

[<de...@us...>]

Revision: 9636
          http://sourceforge.net/p/fudaa/svn/9636
Author:   deniger
Date:     2017-06-07 20:41:22 +0000 (Wed, 07 Jun 2017)
Log Message:
-----------
verification commit sur branche

Modified Paths:
--------------
    branches/fudaa_crue_aoc/crue-compare/pom.xml
    branches/fudaa_crue_aoc/crue-config/pom.xml
    branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/common-1.2.xsd
    branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/frag-common-1.2.xsd
    branches/fudaa_crue_aoc/crue-core/pom.xml
    branches/fudaa_crue_aoc/crue-emh/pom.xml
    branches/fudaa_crue_aoc/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/CrueFileType.java
    branches/fudaa_crue_aoc/crue-io/pom.xml
    branches/fudaa_crue_aoc/crue-project/pom.xml
    branches/fudaa_crue_aoc/crue-sysdoc/pom.xml
    branches/fudaa_crue_aoc/crue-test/pom.xml
    branches/fudaa_crue_aoc/crue-validation/pom.xml
    branches/fudaa_crue_aoc/pom.xml
    branches/fudaa_crue_aoc/ui-application/pom.xml
    branches/fudaa_crue_aoc/ui-branding/pom.xml
    branches/fudaa_crue_aoc/ui-commandline/pom.xml
    branches/fudaa_crue_aoc/ui-common/pom.xml
    branches/fudaa_crue_aoc/ui-common/src/main/java/org/fudaa/fudaa/crue/common/PerspectiveEnum.java
    branches/fudaa_crue_aoc/ui-comparison/pom.xml
    branches/fudaa_crue_aoc/ui-emh/pom.xml
    branches/fudaa_crue_aoc/ui-loader/pom.xml
    branches/fudaa_crue_aoc/ui-loi/pom.xml
    branches/fudaa_crue_aoc/ui-modelling/pom.xml
    branches/fudaa_crue_aoc/ui-options/pom.xml
    branches/fudaa_crue_aoc/ui-planimetry/pom.xml
    branches/fudaa_crue_aoc/ui-post/pom.xml
    branches/fudaa_crue_aoc/ui-report/pom.xml
    branches/fudaa_crue_aoc/ui-study/pom.xml
    branches/fudaa_crue_aoc/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueChildFactory.java
    branches/fudaa_crue_aoc/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingFichierCrue.java
    branches/fudaa_crue_aoc/ui-sysdoc/pom.xml
    branches/fudaa_crue_aoc/ui-views/pom.xml
    branches/fudaa_crue_aoc/ui-wrapper/pom.xml

Added Paths:
-----------
    branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/frag-lhpt-1.2.xsd
    branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/lhpt-1.2.xsd

Modified: branches/fudaa_crue_aoc/crue-compare/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/crue-compare/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/crue-compare/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>crue-compare</artifactId>
   <name>Crue Compare</name>

Modified: branches/fudaa_crue_aoc/crue-config/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/crue-config/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/crue-config/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>crue-config</artifactId>
   <name>Crue Config</name>

Modified: branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/common-1.2.xsd
===================================================================
--- branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/common-1.2.xsd	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/common-1.2.xsd	2017-06-07 20:41:22 UTC (rev 9636)
@@ -14,4 +14,4 @@
 
 	<xs:include schemaLocation="nomRef-fichierUnique-1.2.xsd" />
 	<xs:include schemaLocation="frag-common-1.2.xsd" />
-</xs:schema>
\ No newline at end of file
+</xs:schema>

Modified: branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/frag-common-1.2.xsd
===================================================================
--- branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/frag-common-1.2.xsd	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/frag-common-1.2.xsd	2017-06-07 20:41:22 UTC (rev 9636)
@@ -6,7 +6,7 @@
 	<xs:annotation>
 		<!-- La Version et la Release doivent être mises à jour à chaque modification de cette xsd -->
 		<xs:documentation xml:lang="fr">
-			Version 1.2 Release 7
+			Version 1.2 Release 8
 			schema definissant les types, éléments partageables.
 			Cette xsd est incomplete et n'est pas valide.
 			Elle doit être associée à
@@ -25,7 +25,7 @@
 		<xs:simpleType>
 			<xs:restriction base="xs:string">
 				<!-- Ci-dessous, avec quelles versions de Crue cette grammaire est compatible -->
-				<xs:pattern value="10.0.*" />
+				<xs:pattern value="10\.[0-2]\.([0-9])+" />
 			</xs:restriction>
 		</xs:simpleType>
 	</xs:element>
@@ -183,7 +183,7 @@
 	</xs:complexType>
 
 	<xs:element name="PointFF" type="TypeVec2d" />
-
+	
 	<xs:complexType name="TypeSeriePointFF">
 		<xs:annotation>
 			<xs:documentation>
@@ -194,6 +194,19 @@
 			<xs:element ref="PointFF" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
+	
+	<xs:element name="PointTF" type="TypeVec2d" />
+	
+	<xs:complexType name="TypeSeriePointTF">
+		<xs:annotation>
+			<xs:documentation>
+				Définit une serie non nommée de PointTF.
+			</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element ref="PointTF" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
 
 	<xs:simpleType name="TypeNullString">
 		<xs:restriction base="xs:string">
@@ -238,6 +251,17 @@
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>
+	
+	<xs:complexType name="TypeLoiTF">
+		<xs:complexContent>
+			<xs:extension base="TypeLoi">
+				<xs:sequence>
+					<xs:element ref="Commentaire" minOccurs="0" />
+					<xs:element name="EvolutionFF" type="TypeSeriePointFF" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
 
 	<xs:simpleType name="TypeForAttributeNomBatiCasier">
 		<xs:restriction base="TypeForAttributeNom">
@@ -336,6 +360,18 @@
 (\+|\-)?(0|[1-9][0-9]*)?(\.[0-9]*)?((E|e)(\+|\-)?[0-9]+)?)?" />
 		</xs:restriction>
 	</xs:simpleType>
+	
+	<xs:simpleType name="TypeNomVal">
+		<xs:annotation>
+			<xs:documentation>
+				Permet de spécifier des valeurs du style Nom Valeur. Exemple P153.500 1.00
+			</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:whiteSpace value="collapse" />
+			<xs:pattern value="((.)+(\+|\-)?([0-9]+(\.[0-9]*)?|\.[0-9]+)((E|e)(\+|\-)?[0-9]+)?)?" />
+		</xs:restriction>
+	</xs:simpleType>
 
 	<xs:simpleType name="TypeSeverite">
 		<xs:restriction base="xs:string">

Added: branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/frag-lhpt-1.2.xsd
===================================================================
--- branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/frag-lhpt-1.2.xsd	                        (rev 0)
+++ branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/frag-lhpt-1.2.xsd	2017-06-07 20:41:22 UTC (rev 9636)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	attributeFormDefault="unqualified" elementFormDefault="qualified"
+	targetNamespace="http://www.fudaa.fr/xsd/crue" xmlns="http://www.fudaa.fr/xsd/crue">
+
+	<xs:annotation>
+		<!-- La Version et la Release doivent être mises à jour à chaque modification de cette xsd -->
+		<xs:documentation xml:lang="fr">
+			Version 1.2 Release 1
+			schema incomplet: voir le meme sans le préfixe frag-
+			pour la validation par fichier
+		</xs:documentation>
+	</xs:annotation>
+
+	<xs:element name="Lois">
+		<xs:complexType>
+			<xs:choice minOccurs="0" maxOccurs="unbounded">
+				<xs:element name="LoiDF" type="TypeLoiDF" />
+				<xs:element name="LoiFF" type="TypeLoiFF" />
+				<xs:element name="LoiTF" type="TypeLoiTF" />
+			</xs:choice>
+		</xs:complexType>
+	</xs:element>
+
+	<!-- GENERAL -->
+	<xs:element name="LHPT">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="Commentaire" minOccurs="0" />
+				<xs:element ref="Lois" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+
+</xs:schema>

Added: branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/lhpt-1.2.xsd
===================================================================
--- branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/lhpt-1.2.xsd	                        (rev 0)
+++ branches/fudaa_crue_aoc/crue-config/src/test/resources/xsd/lhpt-1.2.xsd	2017-06-07 20:41:22 UTC (rev 9636)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	attributeFormDefault="unqualified" elementFormDefault="qualified"
+	targetNamespace="http://www.fudaa.fr/xsd/crue" xmlns="http://www.fudaa.fr/xsd/crue">
+
+	<xs:annotation>
+		<!-- La Version et la Release doivent être mises à jour à chaque modification de cette xsd -->
+		<xs:documentation xml:lang="fr">
+			Version 1.2 Release 0
+			Ce schema est utilise pour valider
+			le fichier LHPT
+		</xs:documentation>
+	</xs:annotation>
+
+	<xs:include schemaLocation="common-1.2.xsd" />
+	<xs:include schemaLocation="frag-lhpt-1.2.xsd" />
+</xs:schema>

Modified: branches/fudaa_crue_aoc/crue-core/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/crue-core/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/crue-core/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>crue-core</artifactId>
   <name>Crue Core</name>

Modified: branches/fudaa_crue_aoc/crue-emh/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/crue-emh/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/crue-emh/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>crue-emh</artifactId>
   <name>Crue EMH</name>

Modified: branches/fudaa_crue_aoc/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/CrueFileType.java
===================================================================
--- branches/fudaa_crue_aoc/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/CrueFileType.java	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/crue-emh/src/main/java/org/fudaa/dodico/crue/metier/CrueFileType.java	2017-06-07 20:41:22 UTC (rev 9636)
@@ -22,6 +22,7 @@
   DCSP(CrueLevelType.SOUS_MODELE, CrueVersionType.CRUE10),
   DFRT(CrueLevelType.SOUS_MODELE, CrueVersionType.CRUE10),
   DLHY(CrueLevelType.SCENARIO, CrueVersionType.CRUE10),
+  LHPT(CrueLevelType.SCENARIO, CrueVersionType.CRUE10),
   DPTG(CrueLevelType.SOUS_MODELE, CrueVersionType.CRUE10),
   DPTI(CrueLevelType.MODELE, CrueVersionType.CRUE10),
   DRSO(CrueLevelType.SOUS_MODELE, CrueVersionType.CRUE10),

Modified: branches/fudaa_crue_aoc/crue-io/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/crue-io/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/crue-io/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>crue-io</artifactId>
   <name>Crue IO</name>

Modified: branches/fudaa_crue_aoc/crue-project/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/crue-project/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/crue-project/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>crue-project</artifactId>
   <name>Crue Project</name>

Modified: branches/fudaa_crue_aoc/crue-sysdoc/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/crue-sysdoc/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/crue-sysdoc/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>crue-sysdoc</artifactId>
   <name>Crue Sysdoc</name>

Modified: branches/fudaa_crue_aoc/crue-test/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/crue-test/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/crue-test/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>crue-test</artifactId>

Modified: branches/fudaa_crue_aoc/crue-validation/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/crue-validation/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/crue-validation/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>crue-validation</artifactId>
   <name>Crue Validation</name>

Modified: branches/fudaa_crue_aoc/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -9,7 +9,7 @@
   </parent>
   <groupId>org.fudaa.soft.fudaa-crue</groupId>
   <artifactId>fudaa-crue</artifactId>
-  <version>1.3</version>
+  <version>1.4-SNAPSHOT</version>
   <name>Fudaa-Crue</name>
   <packaging>pom</packaging>
   <ciManagement>
@@ -36,6 +36,7 @@
     <module>crue-io</module>
     <module>crue-compare</module>
     <module>crue-otfa</module>
+    <module>crue-aoc</module>
     <module>crue-project</module>
     <module>crue-validation</module>
     <module>crue-sysdoc</module>
@@ -45,6 +46,7 @@
     <module>ui-modelling</module>
     <module>ui-post</module>
     <module>ui-otfa</module>
+    <module>ui-aoc</module>
     <module>ui-application</module>
     <module>ui-options</module>
     <module>ui-emh</module>
@@ -138,6 +140,11 @@
       </dependency>
       <dependency>
         <groupId>org.fudaa.soft.fudaa-crue</groupId>
+        <artifactId>crue-aoc</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.fudaa.soft.fudaa-crue</groupId>
         <artifactId>crue-compare</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -266,6 +273,11 @@
       </dependency>
       <dependency>
         <groupId>org.fudaa.soft.fudaa-crue</groupId>
+        <artifactId>ui-aoc</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.fudaa.soft.fudaa-crue</groupId>
         <artifactId>ui-comparison</artifactId>
         <version>${project.version}</version>
       </dependency>

Modified: branches/fudaa_crue_aoc/ui-application/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-application/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-application/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>application</artifactId>
@@ -91,6 +91,10 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>ui-aoc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>ui-options</artifactId>
     </dependency>
   </dependencies>

Modified: branches/fudaa_crue_aoc/ui-branding/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-branding/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-branding/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-branding</artifactId>

Modified: branches/fudaa_crue_aoc/ui-commandline/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-commandline/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-commandline/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>ui-commandline</artifactId>
   <packaging>nbm</packaging>

Modified: branches/fudaa_crue_aoc/ui-common/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-common/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-common/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-common</artifactId>

Modified: branches/fudaa_crue_aoc/ui-common/src/main/java/org/fudaa/fudaa/crue/common/PerspectiveEnum.java
===================================================================
--- branches/fudaa_crue_aoc/ui-common/src/main/java/org/fudaa/fudaa/crue/common/PerspectiveEnum.java	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-common/src/main/java/org/fudaa/fudaa/crue/common/PerspectiveEnum.java	2017-06-07 20:41:22 UTC (rev 9636)
@@ -1,23 +1,24 @@
 package org.fudaa.fudaa.crue.common;
 
 /**
- *
  * @author deniger
  */
 public enum PerspectiveEnum {
 
-  STUDY("etude"),
-  MODELLING("modelisation"),
-  POST("compteRendu"),
-  REPORT("rapport"),
-  TEST("otfa");
-  private final String helpId;
+    STUDY("etude"),
+    MODELLING("modelisation"),
+    POST("compteRendu"),
+    REPORT("rapport"),
+    TEST("otfa"),
+    AOC("aoc");
 
-  private PerspectiveEnum(String helpId) {
-    this.helpId = helpId;
-  }
+    private final String helpId;
 
-  public String getHelpId() {
-    return helpId;
-  }
+    private PerspectiveEnum(String helpId) {
+        this.helpId = helpId;
+    }
+
+    public String getHelpId() {
+        return helpId;
+    }
 }

Modified: branches/fudaa_crue_aoc/ui-comparison/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-comparison/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-comparison/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>ui-comparison</artifactId>
   <packaging>nbm</packaging>

Modified: branches/fudaa_crue_aoc/ui-emh/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-emh/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-emh/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>ui-emh</artifactId>
   <packaging>nbm</packaging>

Modified: branches/fudaa_crue_aoc/ui-loader/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-loader/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-loader/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>ui-loader</artifactId>
   <packaging>nbm</packaging>

Modified: branches/fudaa_crue_aoc/ui-loi/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-loi/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-loi/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-loi</artifactId>

Modified: branches/fudaa_crue_aoc/ui-modelling/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-modelling/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-modelling/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-modelling</artifactId>

Modified: branches/fudaa_crue_aoc/ui-options/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-options/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-options/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>ui-options</artifactId>
   <name>Crue UI Options</name>

Modified: branches/fudaa_crue_aoc/ui-planimetry/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-planimetry/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-planimetry/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-planimetry</artifactId>

Modified: branches/fudaa_crue_aoc/ui-post/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-post/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-post/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-post</artifactId>

Modified: branches/fudaa_crue_aoc/ui-report/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-report/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-report/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-report</artifactId>

Modified: branches/fudaa_crue_aoc/ui-study/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-study/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-study/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-study</artifactId>

Modified: branches/fudaa_crue_aoc/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueChildFactory.java
===================================================================
--- branches/fudaa_crue_aoc/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueChildFactory.java	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/FichierCrueChildFactory.java	2017-06-07 20:41:22 UTC (rev 9636)
@@ -7,7 +7,7 @@
 import org.openide.nodes.Node;
 
 /**
- * Used to create scenario node
+ * Used to create files node for a conteneur
  * @author Fred Deniger
  */
 public class FichierCrueChildFactory extends ChildFactory<FichierCrue> {
@@ -22,8 +22,8 @@
 
   @Override
   protected boolean createKeys(List<FichierCrue> list) {
-    for (FichierCrue scenario : conteneur.getFichiers()) {
-      list.add(scenario);
+    for (FichierCrue fichierCrue : conteneur.getFichiers()) {
+      list.add(fichierCrue);
     }
     return true;
   }

Modified: branches/fudaa_crue_aoc/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingFichierCrue.java
===================================================================
--- branches/fudaa_crue_aoc/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingFichierCrue.java	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-study/src/main/java/org/fudaa/fudaa/crue/study/node/ListingFichierCrue.java	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
  */
 package org.fudaa.fudaa.crue.study.node;
 
-import java.util.Collection;
+import org.fudaa.dodico.crue.metier.CrueFileType;
 import org.fudaa.dodico.crue.metier.etude.EMHProjet;
 import org.fudaa.dodico.crue.metier.etude.FichierCrue;
 import org.fudaa.fudaa.crue.study.services.StudyChangeListenerService;
@@ -11,37 +11,44 @@
 import org.openide.nodes.Node;
 import org.openide.util.Lookup;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 /**
- *
  * @author Fred Deniger
  */
 public class ListingFichierCrue extends ChildrenKeysAbstract<FichierCrue> {
-  
-  private final EMHProjet projet;
-  StudyChangeListenerService studyChangeListenerService = Lookup.getDefault().lookup(StudyChangeListenerService.class);
-  
-  public ListingFichierCrue(EMHProjet projet) {
-    this.projet = projet;
-  }
-  
-  @Override
-  protected Node createNode(String key) {
-    final FichierCrueNode fichierCrueNode = new FichierCrueNode(projet.getInfos().getFileFromBase(key));
-    fichierCrueNode.addPropertyChangeListener(studyChangeListenerService);
-    return fichierCrueNode;
-  }
-  
-  @Override
-  protected Collection<FichierCrue> getObjects() {
-    return projet.getInfos().getBaseFichiersProjets();
-  }
-  
-  void updateProperties() {
-    Node[] allNodes = getNodes();
-    for (Node node : allNodes) {
-      FichierCrueNode fichierCrueNode = (FichierCrueNode) node;
-      fichierCrueNode.updateIcon();
-      
+
+    private final EMHProjet projet;
+    StudyChangeListenerService studyChangeListenerService = Lookup.getDefault().lookup(StudyChangeListenerService.class);
+
+    public ListingFichierCrue(EMHProjet projet) {
+        this.projet = projet;
     }
-  }
+
+    @Override
+    protected Node createNode(String key) {
+        final FichierCrueNode fichierCrueNode = new FichierCrueNode(projet.getInfos().getFileFromBase(key));
+        fichierCrueNode.addPropertyChangeListener(studyChangeListenerService);
+        return fichierCrueNode;
+    }
+
+    @Override
+    protected Collection<FichierCrue> getObjects() {
+        //AOC: on ajoute les fichiers lhpt.xml trouvés
+        List<FichierCrue> res=new ArrayList<>();
+        res.addAll(projet.getInfos().getBaseFichiersProjets());
+        res.add(new FichierCrue("test","/la", CrueFileType.LHPT));
+        return res;
+    }
+
+    void updateProperties() {
+        Node[] allNodes = getNodes();
+        for (Node node : allNodes) {
+            FichierCrueNode fichierCrueNode = (FichierCrueNode) node;
+            fichierCrueNode.updateIcon();
+
+        }
+    }
 }

Modified: branches/fudaa_crue_aoc/ui-sysdoc/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-sysdoc/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-sysdoc/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>fudaa-crue</artifactId>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-sysdoc</artifactId>

Modified: branches/fudaa_crue_aoc/ui-views/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-views/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui-views/pom.xml	2017-06-07 20:41:22 UTC (rev 9636)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.fudaa.soft.fudaa-crue</groupId>
     <artifactId>fudaa-crue</artifactId>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <packaging>nbm</packaging>
   <artifactId>ui-views</artifactId>

Modified: branches/fudaa_crue_aoc/ui-wrapper/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-wrapper/pom.xml	2017-06-07 09:31:16 UTC (rev 9635)
+++ branches/fudaa_crue_aoc/ui...
 
[truncated message content]

[Fudaa-svn-commit] SF.net SVN: fudaa:[9637] branches/fudaa_crue_aoc

[<de...@us...>]

Revision: 9637
          http://sourceforge.net/p/fudaa/svn/9637
Author:   deniger
Date:     2017-06-07 20:45:53 +0000 (Wed, 07 Jun 2017)
Log Message:
-----------
verification commit sur branche

Added Paths:
-----------
    branches/fudaa_crue_aoc/crue-aoc/
    branches/fudaa_crue_aoc/crue-aoc/pom.xml
    branches/fudaa_crue_aoc/crue-aoc/src/
    branches/fudaa_crue_aoc/crue-aoc/src/main/
    branches/fudaa_crue_aoc/crue-aoc/src/main/java/
    branches/fudaa_crue_aoc/crue-aoc/src/main/java/org/
    branches/fudaa_crue_aoc/crue-aoc/src/main/java/org/fudaa/
    branches/fudaa_crue_aoc/crue-aoc/src/main/java/org/fudaa/dodico/
    branches/fudaa_crue_aoc/crue-aoc/src/main/java/org/fudaa/dodico/crue/
    branches/fudaa_crue_aoc/crue-aoc/src/main/resources/
    branches/fudaa_crue_aoc/crue-aoc/src/test/
    branches/fudaa_crue_aoc/crue-aoc/src/test/java/
    branches/fudaa_crue_aoc/crue-aoc/src/test/java/org/
    branches/fudaa_crue_aoc/crue-aoc/src/test/java/org/fudaa/
    branches/fudaa_crue_aoc/crue-aoc/src/test/java/org/fudaa/dodico/
    branches/fudaa_crue_aoc/crue-aoc/src/test/java/org/fudaa/dodico/crue/
    branches/fudaa_crue_aoc/crue-aoc/src/test/resources/
    branches/fudaa_crue_aoc/ui-aoc/
    branches/fudaa_crue_aoc/ui-aoc/src/
    branches/fudaa_crue_aoc/ui-aoc/src/main/
    branches/fudaa_crue_aoc/ui-aoc/src/main/nbm/
    branches/fudaa_crue_aoc/ui-aoc/src/main/nbm/module.xml

Added: branches/fudaa_crue_aoc/crue-aoc/pom.xml
===================================================================
--- branches/fudaa_crue_aoc/crue-aoc/pom.xml	                        (rev 0)
+++ branches/fudaa_crue_aoc/crue-aoc/pom.xml	2017-06-07 20:45:53 UTC (rev 9637)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>fudaa-crue</artifactId>
+    <groupId>org.fudaa.soft.fudaa-crue</groupId>
+    <version>1.4-SNAPSHOT</version>
+  </parent>
+  <artifactId>crue-aoc</artifactId>
+  <name>Crue AOC</name>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <parallel>classes</parallel>
+          <threadCount>5</threadCount>
+        </configuration>
+      </plugin>
+    </plugins>
+   
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.fudaa.soft.fudaa-crue</groupId>
+      <artifactId>crue-project</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.fudaa.soft.fudaa-crue</groupId>
+      <artifactId>crue-compare</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.fudaa.soft.fudaa-crue</groupId>
+      <artifactId>crue-core</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.fudaa.soft.fudaa-crue</groupId>
+      <artifactId>crue-io</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.fudaa.soft.fudaa-crue</groupId>
+      <artifactId>crue-config</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.fudaa.soft.fudaa-crue</groupId>
+      <artifactId>crue-config</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.fudaa.soft.fudaa-crue</groupId>
+      <artifactId>crue-test</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <!--pour eviter de lancer les tests d'integration-->
+  <profiles>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.keyboardsamurais.maven</groupId>
+            <artifactId>maven-timestamp-plugin</artifactId>
+            <version>1.0</version>
+            <configuration>
+              <propertyName>timestamp</propertyName>
+              <timestampPattern>dd.MM.yyyy HH:mm</timestampPattern>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>create</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>

Added: branches/fudaa_crue_aoc/ui-aoc/src/main/nbm/module.xml
===================================================================
--- branches/fudaa_crue_aoc/ui-aoc/src/main/nbm/module.xml	                        (rev 0)
+++ branches/fudaa_crue_aoc/ui-aoc/src/main/nbm/module.xml	2017-06-07 20:45:53 UTC (rev 9637)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nbm>
+    <!--
+    <moduleType>autoload</moduleType>
+    <codeNameBase>org.fudaa.fudaa.test.uiotfa/1</codeNameBase>
+    <licenseName>Apache License, Version 2.0</licenseName>
+    <licenseFile>license.txt</licenseFile>
+    -->
+</nbm>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.