Changeset 7817

Timestamp:

12/19/06 18:27:30 (4 years ago)

Author:

sys

Message:

Personnalisation d'une extension d'un item de composition

Location:

trunk/Wsp_Modeling

Files:

• es/content/organisation/compositionPrim/xml.xed.xml (modified) (1 diff)
• es/content/resources/audioPrim/xml.xed.xml (modified) (1 diff)
• es/content/resources/binaryPrim/xml.xed.xml (modified) (1 diff)
• es/content/resources/folderPrim/xml.xed.xml (modified) (1 diff)
• es/content/resources/imagePrim/xml.xed.xml (modified) (1 diff)
• es/content/resources/videoPrim/xml.xed.xml (modified) (1 diff)
• es/content/xEdition/core.xed.xml (modified) (1 diff)
• spaces/gen/modelBuilder/bs.doss/_common/sm/organisationPrims.xml (modified) (2 diffs)
• spaces/gen/modelBuilder/bs.doss/_common/sm/organisationSs.xml (modified) (1 diff)

trunk/Wsp_Modeling/es/content/organisation/compositionPrim/xml.xed.xml

@@ -92 +92 @@
                         <childs>
                                 <se:ref se:refid="sm:help" se:refurl="chrome://sm_modeling/content/xEdition/core.xed.xml"/>
-                                <se:ref se:refid="sm:identification" se:refurl="chrome://sm_modeling/content/xEdition/core.xed.xml"/>
-                                <element se:bind="element" se:name="sm:structure" se:card="1">
+                                <se:ref se:refid="sm:identificationWithExt" se:refurl="chrome://sm_modeling/content/xEdition/core.xed.xml"/>
+                                <element se:bind="element" se:name="sm:structure">
                                         <atts/>
                                         <childs>

trunk/Wsp_Modeling/es/content/resources/audioPrim/xml.xed.xml

@@ -58 +58 @@
                         <childs>
                                 <se:ref se:refid="sm:help" se:refurl="chrome://sm_modeling/content/xEdition/core.xed.xml"/>
-                                <element se:id="sm:identificationWithExtension" se:bind="element" se:name="sm:identification" se:card="1">
+                                <element se:bind="element" se:name="sm:identification">
                                         <atts>
                                                 <attribute se:name="extensions" se:bind="attribute" se:mandat="true">
-                                                        <wordsInput notnull="true" trim="true" flex="1"/>
+                                                        <wordsInput notnull="true" trim="true"/>
                                                 </attribute>
                                         </atts>

trunk/Wsp_Modeling/es/content/resources/binaryPrim/xml.xed.xml

@@ -64 +64 @@
                         <childs>
                                 <se:ref se:refid="sm:help" se:refurl="chrome://sm_modeling/content/xEdition/core.xed.xml"/>
-                                <element se:id="sm:identificationWithExtension" se:bind="element" se:name="sm:identification" se:card="1">
+                                <element se:bind="element" se:name="sm:identification">
                                         <atts>
                                                 <attribute se:name="extensions" se:bind="attribute" se:mandat="true">
-                                                        <wordsInput notnull="true" trim="true" flex="1"/>
+                                                        <wordsInput notnull="true" trim="true"/>
                                                 </attribute>
                                         </atts>

trunk/Wsp_Modeling/es/content/resources/folderPrim/xml.xed.xml

@@ -57 +57 @@
                         <childs>
                                 <se:ref se:refid="sm:help" se:refurl="chrome://sm_modeling/content/xEdition/core.xed.xml"/>
-                                <element se:id="sm:identificationWithExtension" se:bind="element" se:name="sm:identification" se:card="1">
+                                <element se:bind="element" se:name="sm:identification">
                                         <atts>
                                                 <attribute se:name="extensions" se:bind="attribute" se:mandat="true">
-                                                        <wordsInput notnull="true" trim="true" flex="1"/>
+                                                        <wordsInput notnull="true" trim="true"/>
                                                 </attribute>
                                         </atts>

trunk/Wsp_Modeling/es/content/resources/imagePrim/xml.xed.xml

@@ -57 +57 @@
                         <childs>
                                 <se:ref se:refid="sm:help" se:refurl="chrome://sm_modeling/content/xEdition/core.xed.xml"/>
-                                <element se:bind="element" se:name="sm:identification" se:card="1">
+                                <element se:bind="element" se:name="sm:identification">
                                         <atts>
                                                 <attribute se:bind="attribute" se:name="extensions" se:mandat="true">
-                                                        <wordsInput notnull="true" trim="true" flex="1"/>
+                                                        <wordsInput notnull="true" trim="true"/>
                                                 </attribute>
                                         </atts>

trunk/Wsp_Modeling/es/content/resources/videoPrim/xml.xed.xml

@@ -58 +58 @@
                         <childs>
                                 <se:ref se:refid="sm:help" se:refurl="chrome://sm_modeling/content/xEdition/core.xed.xml"/>
-                                <element se:id="sm:identificationWithExtension" se:bind="element" se:name="sm:identification" se:card="1">
+                                <element se:bind="element" se:name="sm:identification">
                                         <atts>
                                                 <attribute se:name="extensions" se:bind="attribute" se:mandat="true">
-                                                        <wordsInput notnull="true" trim="true" flex="1"/>
+                                                        <wordsInput notnull="true" trim="true"/>
                                                 </attribute>
                                         </atts>

trunk/Wsp_Modeling/es/content/xEdition/core.xed.xml

@@ -68 +68 @@
                                 </attribute>
                                 <attribute se:bind="attribute" se:name="targetPrefix" se:mandat="true">
-                                        <wordsInput notnull="true" trim="true" validRegExp="^[a-zA-Z0-9_À-ÿ:\\\/.&amp;$-]+$" autocompleteProviderXPath="../../xul:wspInputHistoryProvider[@code='targetPrefix']"/>
+                                        <wordsInput notnull="true" trim="true" validRegExp="^[a-zA-Z0-9]+$" autocompleteProviderXPath="../../xul:wspInputHistoryProvider[@code='targetPrefix']"/>
                                 </attribute>
                                 <attribute se:bind="attribute" se:name="code" se:mandat="true">
-                                        <wordsInput notnull="true" trim="true" filterRegExp="^[a-zA-Z0-9]+$"/>
+                                        <wordsInput notnull="true" trim="true" validRegExp="^[a-zA-Z0-9]+$"/>
+                                </attribute>
+                        </atts>
+                </element>
+                <element se:id="sm:identificationWithExt" se:bind="element" se:name="sm:identification" se:card="1">
+                        <atts>
+                                <wspInputHistoryProvider code="identifNamespace"/>
+                                <wspInputHistoryProvider code="targetPrefix"/>
+                                <attribute se:bind="attribute" se:name="targetNamespace" se:mandat="true">
+                                        <wordsInput notnull="true" trim="true" validRegExp="^[a-zA-Z0-9_À-ÿ:\\\/.&amp;$-]+$" autocompleteProviderXPath="../../xul:wspInputHistoryProvider[@code='identifNamespace']"/>
+                                </attribute>
+                                <attribute se:bind="attribute" se:name="targetPrefix" se:mandat="true">
+                                        <wordsInput notnull="true" trim="true" validRegExp="^[a-zA-Z0-9]+$" autocompleteProviderXPath="../../xul:wspInputHistoryProvider[@code='targetPrefix']"/>
+                                </attribute>
+                                <attribute se:bind="attribute" se:name="code" se:mandat="true">
+                                        <wordsInput notnull="true" trim="true" validRegExp="^[a-zA-Z0-9]+$"/>
+                                </attribute>
+                                <attribute se:bind="attribute" se:name="itemExtension" se:defaultvalue="xml" tooltiptext="Extension du fichier sans le point : 'module', 'etape'...">
+                                        <wordsInput notnull="true" trim="true"/>
                                 </attribute>
                         </atts>

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/_common/sm/organisationPrims.xml

@@ -245 +245 @@
                         "[![agent=//iconFolderPath]!]/icovalid.png",
                         null,
-                        ".xml",
+                        "[![agent=//fileExt]!]",
                         "string",
                         '<?xml version="1.0" encoding="UTF-8"?><sc:item xmlns:sc="http://www.utc.fr/ics/scenari/v3/core" xmlns:[![agent=//prefixModel]!]="[![agent=//nsModel]!]"><[![agent=//prefixModel]!]:[![agent=//tagRootModel]!]/></sc:item>',
@@ -438 +438 @@
                 <source type="xpath-statique">si(sm:structure/sm:meta/@sc:refUri, concat('@', getIdFromPath(sm:structure/sm:meta/@sc:refUri)))</source>
         </valeur>
+        <!-- Itel public : extension de l'item -->
+        <valeur code="fileExt">
+                <source type="xpath-statique">si(sm:identification/@itemExtension, si(starts-with(sm:identification/@itemExtension, '.'), sm:identification/@itemExtension, concat('.', sm:identification/@itemExtension)), '.xml')</source>
+        </valeur>
         <!-- Item public : Chemin d'acc�au dossier d'icone : res:src=wsp:xxx;dst=yyy-->
         <valeur code="iconFolderPath">

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/_common/sm/organisationSs.xml

@@ -29 +29 @@
         <sdr format="text/xml"/>
         
-        <module code="identif" type="com.scenari.m.bdp.module.identif.epicure.HModuleIdentifEpicureLoader" localName="[![agent=//tagRootModel]!]" namespace="[![agent=//nsModel]!]"/>
+        <module code="identif" type="com.scenari.m.bdp.module.identif.xml.HModuleIdentifItemLoader" localName="[![agent=//tagRootModel]!]" namespace="[![agent=//nsModel]!]" fileExt="[![agent=//fileExt]!]"/>
         
         <module code="pres" type="com.scenari.m.bdp.module.pres.HModulePresLoader">