Changeset 7462

Timestamp:

11/23/06 16:18:46 (5 years ago)

Author:

sys

Message:

api Donnee -> api Data

Location:

trunk/Jav_Builder/com/scenari/m/builder/gen

Files:

• HModelGenerator.java (modified) (24 diffs)
• RelaxNgPage.java (modified) (1 diff)
• WDonneeCrossModels.java (modified) (7 diffs)
• XedNsPage.java (modified) (3 diffs)
• XhtmlWmTemplatePage.java (modified) (2 diffs)

trunk/Jav_Builder/com/scenari/m/builder/gen/HModelGenerator.java

@@ -75 +75 @@
 import com.scenari.m.co.agent.IWAgent;
 import com.scenari.m.co.agent.IWAgentAvecLiens;
-import com.scenari.m.co.agent.IWAgentAvecResultat;
+import com.scenari.m.co.agent.IWAgentComputor;
 import com.scenari.m.co.dialog.IHDialog;
 import com.scenari.m.co.donnee.HADonneeMgr;
@@ -403 +403 @@
                 public String getCode() throws Exception {
                         if (fCode == null) {
-                                fCode = ((IWAgentAvecResultat) fAgent.hGetAgentAssoc("codeGenerator")).hGetResultat(fRootDialog, null).hGetValue();
+                                fCode = ((IWAgentComputor) fAgent.hGetAgentAssoc("codeGenerator")).computeAsData(fRootDialog, null).getString();
                         }
                         return fCode;
@@ -410 +410 @@
                 public String getRootPathGen() throws Exception {
                         if (fRootPathGen == null) {
-                                fRootPathGen = ((IWAgentAvecResultat) fAgent.hGetAgentAssoc("rootPathGen")).hGetResultat(fRootDialog, null).hGetValue();
+                                fRootPathGen = ((IWAgentComputor) fAgent.hGetAgentAssoc("rootPathGen")).computeAsData(fRootDialog, null).getString();
                         }
                         return fRootPathGen;
@@ -417 +417 @@
                 public String getRootSpaceGen() throws Exception {
                         if (fRootSpaceGen == null) {
-                                fRootSpaceGen = ((IWAgentAvecResultat) fAgent.hGetAgentAssoc("rootSpaceGen")).hGetResultat(fRootDialog, null).hGetValue();
+                                fRootSpaceGen = ((IWAgentComputor) fAgent.hGetAgentAssoc("rootSpaceGen")).computeAsData(fRootDialog, null).getString();
                         }
                         return fRootSpaceGen;
@@ -424 +424 @@
                 public String getKeyResGen() throws Exception {
                         if (fKeyResGen == null) {
-                                fKeyResGen = ((IWAgentAvecResultat) fAgent.hGetAgentAssoc("keyResGen")).hGetResultat(fRootDialog, null).hGetValue();
+                                fKeyResGen = ((IWAgentComputor) fAgent.hGetAgentAssoc("keyResGen")).computeAsData(fRootDialog, null).getString();
                         }
                         return fKeyResGen;
@@ -442 +442 @@
                         if (fDestUriPublishFile == null) {
                                 String vPathPublishFileInSpaceGen = "/ui.doss/";
-                                IWAgentAvecResultat vAgent = ((IWAgentAvecResultat) fAgent.hGetAgentAssoc("pathPublishFilesInSpaceGen"));
+                                IWAgentComputor vAgent = ((IWAgentComputor) fAgent.hGetAgentAssoc("pathPublishFilesInSpaceGen"));
                                 if (vAgent != null) {
-                                        vPathPublishFileInSpaceGen = vAgent.hGetResultat(fRootDialog, null).hGetValue();
+                                        vPathPublishFileInSpaceGen = vAgent.computeAsData(fRootDialog, null).getString();
                                         if (vPathPublishFileInSpaceGen != null) {
                                                 if (!vPathPublishFileInSpaceGen.startsWith("/")) vPathPublishFileInSpaceGen = "/".concat(vPathPublishFileInSpaceGen);
@@ -507 +507 @@
                                 // Génération des SS ?
                                 IWAgent vAg = fRootDialog.hGoToAgent("/@@/buildSS");
-                                fBuildSS = (vAg == null || ((IWAgentAvecResultat) vAg).hGetResultat(fRootDialog, null).hGetValue().equalsIgnoreCase("true") || fFolderSs.hGetStatus() != IHSource.STATUS_FOLDER);
+                                fBuildSS = (vAg == null || ((IWAgentComputor) vAg).computeAsData(fRootDialog, null).getString().equalsIgnoreCase("true") || fFolderSs.hGetStatus() != IHSource.STATUS_FOLDER);
                                 if (fBuildSS) fFolderSs.hRemove();
 
                                 // Génération des ES ?
                                 vAg = fRootDialog.hGoToAgent("/@@/buildES");
-                                fBuildES = (vAg == null || ((IWAgentAvecResultat) vAg).hGetResultat(fRootDialog, null).hGetValue().equalsIgnoreCase("true") || fFolderEs.hGetStatus() != IHSource.STATUS_FOLDER);
+                                fBuildES = (vAg == null || ((IWAgentComputor) vAg).computeAsData(fRootDialog, null).getString().equalsIgnoreCase("true") || fFolderEs.hGetStatus() != IHSource.STATUS_FOLDER);
                                 if (fBuildES) fFolderEs.hRemove();
 
@@ -940 +940 @@
                         // Recherche du nom du chrome.
                         IWAgent vAg = fRootDialog.hGoToAgent("@@/chromeCode");
-                        fChromeCode = ((IWAgentAvecResultat) vAg).hGetResultat(fRootDialog, null).hGetValue();
+                        fChromeCode = ((IWAgentComputor) vAg).computeAsData(fRootDialog, null).getString();
 
                         // Evaluation du mode.
@@ -1019 +1019 @@
                 IWAgent vInstallManifestAgt = fRootDialog.hGoToAgent("@@/chrome.manifest.appGen");
                 IHSource vEsPack = fFolderAppModelChrome.hFindSource(fChromeCode.concat(".manifest"));
-                if (vInstallManifestAgt != null && vInstallManifestAgt instanceof IWAgentAvecResultat) {
+                if (vInstallManifestAgt != null && vInstallManifestAgt instanceof IWAgentComputor) {
                         OutputStream vOsEs = vEsPack.hGetOutputStream();
                         Writer vWr = new OutputStreamWriter(vOsEs, "UTF-8");
                         try {
-                                ((IWAgentAvecResultat) vInstallManifestAgt).hGetResultat(fRootDialog, null).hWriteValue(vWr);
+                                ((IWAgentComputor) vInstallManifestAgt).computeAsData(fRootDialog, null).writeValue(vWr);
                                 vWr.flush();
                         } finally {
@@ -1044 +1044 @@
                 // appMake.
                 // Non testé
-                String vWspType = ((IWAgentAvecResultat) vWspTypeAgt).hGetResultat(fRootDialog, null).hGetValue();
+                String vWspType = ((IWAgentComputor) vWspTypeAgt).computeAsData(fRootDialog, null).getString();
                 Writer wspMetaXriter = fFolderAppModelJavaserver.hFindSource(".wspmeta").hGetWriter();
                 wspMetaXriter.write(vWspType);
                 wspMetaXriter.close();
                 IWAgent vKeyResWspAgt = fRootDialog.hGoToAgent("@@/keyResWsp");
-                vProps.put(((IWAgentAvecResultat) vKeyResWspAgt).hGetResultat(fRootDialog, null).hGetValue(), vBaseUri + ".wspmeta");
+                vProps.put(((IWAgentComputor) vKeyResWspAgt).computeAsData(fRootDialog, null).getString(), vBaseUri + ".wspmeta");
                 // Création du jar du chrome.
                 IHSource vJarPack = fFolderAppModelChrome.hFindSource("chrome/" + fChromeCode.concat(".jar"));
@@ -1064 +1064 @@
                 fFolderAppModelJavaserver.hFindSource("ss").hCopyFrom(fFolderSs);
                 IWAgent vKeyResSsAgt = fRootDialog.hGoToAgent("@@/keyResSs");
-                vProps.put(((IWAgentAvecResultat) vKeyResSsAgt).hGetResultat(fRootDialog, null).hGetValue(), vBaseUri + "ss");
+                vProps.put(((IWAgentComputor) vKeyResSsAgt).computeAsData(fRootDialog, null).getString(), vBaseUri + "ss");
                 // gen
                 List vListGen = wGetListGenerators();
@@ -1089 +1089 @@
                 String vVersion = "0.0.0";
                 IWAgent vVersionAgt = fRootDialog.hGoToAgent("@@/version");
-                if (vVersionAgt != null && vVersionAgt instanceof IWAgentAvecResultat) {
-                        vVersion = ((IWAgentAvecResultat) vVersionAgt).hGetResultat(fRootDialog, null).hGetValue();
+                if (vVersionAgt != null && vVersionAgt instanceof IWAgentComputor) {
+                        vVersion = ((IWAgentComputor) vVersionAgt).computeAsData(fRootDialog, null).getString();
                 }
                 String vKeyWspVersion;
                 IWAgent vKeyWspVersionAgt = fRootDialog.hGoToAgent("@@/keyWspVersion");
-                if (vKeyWspVersionAgt != null && vKeyWspVersionAgt instanceof IWAgentAvecResultat) {
-                        vKeyWspVersion = ((IWAgentAvecResultat) vKeyWspVersionAgt).hGetResultat(fRootDialog, null).hGetValue();
+                if (vKeyWspVersionAgt != null && vKeyWspVersionAgt instanceof IWAgentComputor) {
+                        vKeyWspVersion = ((IWAgentComputor) vKeyWspVersionAgt).computeAsData(fRootDialog, null).getString();
                 } else {
                         vKeyWspVersion = fChromeCode;
@@ -1112 +1112 @@
                         // Création de install.rdf
                         IWAgent vInstallRdfAgt = fRootDialog.hGoToAgent("@@/install.rdf");
-                        if (vInstallRdfAgt != null && vInstallRdfAgt instanceof IWAgentAvecResultat) {
+                        if (vInstallRdfAgt != null && vInstallRdfAgt instanceof IWAgentComputor) {
                                 ZipEntry vEntry = new ZipEntry("install.rdf");
                                 vEntry.setTime(System.currentTimeMillis());
                                 vXpiStream.putNextEntry(vEntry);
                                 Writer vWr = new OutputStreamWriter(vXpiStream, "UTF-8");
-                                ((IWAgentAvecResultat) vInstallRdfAgt).hGetResultat(fRootDialog, null).hWriteValue(vWr);
+                                ((IWAgentComputor) vInstallRdfAgt).computeAsData(fRootDialog, null).writeValue(vWr);
                                 vWr.flush();
                                 vXpiStream.closeEntry();
@@ -1123 +1123 @@
                         // Création de chrome.manifest
                         IWAgent vInstallManifestAgt = fRootDialog.hGoToAgent("@@/chrome.manifest");
-                        if (vInstallManifestAgt != null && vInstallManifestAgt instanceof IWAgentAvecResultat) {
+                        if (vInstallManifestAgt != null && vInstallManifestAgt instanceof IWAgentComputor) {
                                 ZipEntry vEntry = new ZipEntry("chrome.manifest");
                                 vEntry.setTime(System.currentTimeMillis());
                                 vXpiStream.putNextEntry(vEntry);
                                 Writer vWr = new OutputStreamWriter(vXpiStream, "UTF-8");
-                                ((IWAgentAvecResultat) vInstallManifestAgt).hGetResultat(fRootDialog, null).hWriteValue(vWr);
+                                ((IWAgentComputor) vInstallManifestAgt).computeAsData(fRootDialog, null).writeValue(vWr);
                                 vWr.flush();
                                 vXpiStream.closeEntry();
@@ -1168 +1168 @@
                         try {
                                 IWAgent vWspTypeAgt = fRootDialog.hGoToAgent("@@/wspType");
-                                String vWspType = ((IWAgentAvecResultat) vWspTypeAgt).hGetResultat(fRootDialog, null).hGetValue();
+                                String vWspType = ((IWAgentComputor) vWspTypeAgt).computeAsData(fRootDialog, null).getString();
                                 /*
                                  * IWAgent vExportWspMetaAgt =
@@ -1188 +1188 @@
                         IWAgent vKeyResWspAgt = fRootDialog.hGoToAgent("@@/keyResWsp");
                         vXmlWriter.hWriteStartTag("res");
-                        vXmlWriter.hWriteAttribut("key", ((IWAgentAvecResultat) vKeyResWspAgt).hGetResultat(fRootDialog, null).hGetValue());
+                        vXmlWriter.hWriteAttribut("key", ((IWAgentComputor) vKeyResWspAgt).computeAsData(fRootDialog, null).getString());
                         vXmlWriter.hWriteEndOpenTag();
                         vXmlWriter.hWriteStartTag("version");
@@ -1210 +1210 @@
                         IWAgent vKeyResSsAgt = fRootDialog.hGoToAgent("@@/keyResSs");
                         vXmlWriter.hWriteStartTag("res");
-                        vXmlWriter.hWriteAttribut("key", ((IWAgentAvecResultat) vKeyResSsAgt).hGetResultat(fRootDialog, null).hGetValue());
+                        vXmlWriter.hWriteAttribut("key", ((IWAgentComputor) vKeyResSsAgt).computeAsData(fRootDialog, null).getString());
                         vXmlWriter.hWriteEndOpenTag();
                         vXmlWriter.hWriteStartTag("version");
@@ -1301 +1301 @@
                 fPhase = PHASE_SS;
                 IWAgent vAg = fRootDialog.hGoToAgent("@@/rootPathSs");
-                fRootPathSs = ((IWAgentAvecResultat) vAg).hGetResultat(fRootDialog, null).hGetValue();
+                fRootPathSs = ((IWAgentComputor) vAg).computeAsData(fRootDialog, null).getString();
 
                 xListAllSs(new ArrayList(), new ArrayList(), fRootDialog.hGetAgent());
@@ -1326 +1326 @@
                                 IWAgent vInternalized = ((IWAgent) vLink).hGetAgentAssoc("internalized");
                                 // On évalue si ce lien peut pointer un item externe.
-                                boolean vIsExtrenalLinkAllowed = (vInternalized == null || !((IWAgentAvecResultat) vInternalized).hGetResultat(fRootDialog, null).hGetValue().equals("always"));
+                                boolean vIsExtrenalLinkAllowed = (vInternalized == null || !((IWAgentComputor) vInternalized).computeAsData(fRootDialog, null).getString().equals("always"));
                                 IWAgent[] vListModels = ((IWAgentAvecLiens) vLink).hGetAgentsLies(fRootDialog);
                                 if (vListModels != null) {
@@ -1335 +1335 @@
                                                                 // On crée la SS
                                                                 IWAgent vIsStandAloneItemAgent = vListModels[i].hGetAgentAssoc("isStandAloneItem");
-                                                                if (vIsStandAloneItemAgent != null && ((IWAgentAvecResultat) vIsStandAloneItemAgent).hGetResultat(fRootDialog, null).hGetValue().equals("true")) {
+                                                                if (vIsStandAloneItemAgent != null && ((IWAgentComputor) vIsStandAloneItemAgent).computeAsData(fRootDialog, null).getString().equals("true")) {
                                                                         // Le modèle pointé peut bien constituer un
                                                                         // item autonome -> on crée sa SS
@@ -1453 +1453 @@
                         IWADialogExport vDialogGenerator = fCurrentGenerator.getDialog();
                         IWAgent vBuild = fTestMode ? vAgentGenerator.hGetAgentAssoc("buildGen") : null;
-                        if (vBuild == null || ((IWAgentAvecResultat) vBuild).hGetResultat(vDialogGenerator, null).hGetValue().equalsIgnoreCase("true")) {
+                        if (vBuild == null || ((IWAgentComputor) vBuild).computeAsData(vDialogGenerator, null).getString().equalsIgnoreCase("true")) {
                                 // Affectation des variables de déploiement
                                 IHSource vFolderGen = fCurrentGenerator.getFolder();
@@ -1509 +1509 @@
                 // Code de l'atelier
                 IWAgent vAg = fRootDialog.hGoToAgent("@@/defaultWspCode");
-                String vWspCode = ((IWAgentAvecResultat) vAg).hGetResultat(fRootDialog, null).hGetValue();
+                String vWspCode = ((IWAgentComputor) vAg).computeAsData(fRootDialog, null).getString();
 
                 // Construction du path racine pour les sources et générations de
@@ -1524 +1524 @@
                         try {
                                 vAg = fRootDialog.hGoToAgent("@@/test.wspmeta");
-                                ((IWAgentAvecResultat) vAg).hGetResultat(fRootDialog, null).hWriteValue(vWriterBuf);
+                                ((IWAgentComputor) vAg).computeAsData(fRootDialog, null).writeValue(vWriterBuf);
                         } finally {
                                 vWriterBuf.close();
@@ -1532 +1532 @@
                         Map vKeyResMap = new HashMap();
                         vAg = fRootDialog.hGoToAgent("@@/keyResSs");
-                        String vKeyResSs = ((IWAgentAvecResultat) vAg).hGetResultat(fRootDialog, null).hGetValue();
+                        String vKeyResSs = ((IWAgentComputor) vAg).computeAsData(fRootDialog, null).getString();
                         vKeyResMap.put(vKeyResSs, new File(fFolderSs.hGetUrlFileFormat()));
                         // Ressources pour les generateurs

trunk/Jav_Builder/com/scenari/m/builder/gen/RelaxNgPage.java

@@ -78 +78 @@
         try {
             //On calcule le content
-            pDialogPage.hGetPageCourante().hGetZone("mainZone").hWriteValue(fWriterBuf, pDialogPage, pDialogPage.hGetAgent(), pDialogPage.hGetParam());
+            pDialogPage.hGetPageCourante().hGetZone("mainZone").writeValue(fWriterBuf, pDialogPage, pDialogPage.hGetAgent(), pDialogPage.hGetParam());
             //On ajoute les infos de la page dans les buffers.
             addInfo2NsBuffer(pDialogPage);

trunk/Jav_Builder/com/scenari/m/builder/gen/WDonneeCrossModels.java

@@ -49 +49 @@
 import com.scenari.m.co.agent.IWAgent;
 import com.scenari.m.co.agent.IWAgentAvecLiens;
-import com.scenari.m.co.agent.IWAgentAvecResultat;
+import com.scenari.m.co.agent.IWAgentComputor;
 import com.scenari.m.co.composant.IHComposantType;
 import com.scenari.m.co.composant.IWComposant;
 import com.scenari.m.co.dialog.IHDialog;
-import com.scenari.m.co.donnee.IWADonnee;
+import com.scenari.m.co.donnee.IAgentData;
 import com.scenari.m.co.donnee.WDonnee;
 import com.scenari.s.co.source.IHSource;
@@ -99 +99 @@
 
     /**
-     * @see com.scenari.m.co.donnee.IHDonnee#hGetLevel()
-     */
-    public int hGetLevel() throws java.lang.Exception {
+     * @see com.scenari.m.co.donnee.IData#getLevel()
+     */
+    public int getLevel() throws java.lang.Exception {
         return LEVEL_DYNAMIQUE;
     }
 
     /**
-     * @see com.scenari.m.co.donnee.IHDonnee#hGetValue(com.scenari.m.co.dialog.IHDialog, java.lang.Object,
+     * @see com.scenari.m.co.donnee.IData#getString(com.scenari.m.co.dialog.IHDialog, java.lang.Object,
      *      java.lang.Object)
      */
-    public final String hGetValue(IHDialog pDialog, Object pOwner, Object pArguments) throws Exception {
+    public final String getString(IHDialog pDialog, Object pOwner, Object pArguments) throws Exception {
         StringWriter vWriter = HPoolBuffer.get().hGetStringWriter();
         String vResult = "";
@@ -122 +122 @@
 
     /**
-     * @see com.scenari.m.co.donnee.IHDonnee#hIsRessourceRef(com.scenari.m.co.dialog.IHDialog, java.lang.Object,
+     * @see com.scenari.m.co.donnee.IData#isResRef(com.scenari.m.co.dialog.IHDialog, java.lang.Object,
      *      java.lang.Object)
      */
-    public final boolean hIsRessourceRef(IHDialog pDialog, Object pOwner, Object pArguments) throws Exception {
+    public final boolean isResRef(IHDialog pDialog, Object pOwner, Object pArguments) throws Exception {
         return false;
     }
 
     /**
-     * @see com.scenari.m.co.donnee.IHDonnee#hGetUrlRessource(com.scenari.m.co.dialog.IHDialog, java.lang.Object,
+     * @see com.scenari.m.co.donnee.IData#getUrlRes(com.scenari.m.co.dialog.IHDialog, java.lang.Object,
      *      java.lang.Object)
      */
-    public final String hGetUrlRessource(IHDialog pDialog, Object pOwner, Object pArguments) throws Exception {
+    public final String getUrlRes(IHDialog pDialog, Object pOwner, Object pArguments) throws Exception {
         throw new Exception("Cette donnée n'est pas une ressource statique.");
     }
 
     /**
-     * @see com.scenari.m.co.donnee.IHDonnee#hWriteValue(java.io.Writer, com.scenari.m.co.dialog.IHDialog,
+     * @see com.scenari.m.co.donnee.IData#writeValue(java.io.Writer, com.scenari.m.co.dialog.IHDialog,
      *      java.lang.Object, java.lang.Object)
      */
-    public final void hWriteValue(Writer pWriter, IHDialog pDialog, Object pOwner, Object pArguments) throws Exception {
+    public final void writeValue(Writer pWriter, IHDialog pDialog, Object pOwner, Object pArguments) throws Exception {
         xGetValue(pDialog, pOwner, pArguments, pWriter);
     }
 
     /**
-     * @see com.scenari.m.co.donnee.IWADonnee#wSetComposant(com.scenari.m.co.composant.IWComposant, org.w3c.dom.Element,
+     * @see com.scenari.m.co.donnee.IAgentData#wSetComposant(com.scenari.m.co.composant.IWComposant, org.w3c.dom.Element,
      *      IHSource)
      */
-    public final IWADonnee wSetComposant(IWComposant pComposant, Element pNodeRoot, IHSource pSource) throws Exception {
+    public final IAgentData wSetComposant(IWComposant pComposant, Element pNodeRoot, IHSource pSource) throws Exception {
         return this;
     }
@@ -190 +190 @@
                     IWAgent vRoot = ((IWAgent) pOwner).hGetAgentPrinc();
                     IWAgent vExportAgent = vRoot.hGetAgentParRef(vPathAgent);
-                    if (vExportAgent != null && (vExportAgent instanceof IWAgentAvecResultat)) {
+                    if (vExportAgent != null && (vExportAgent instanceof IWAgentComputor)) {
                         vAnalyzedModels.add(vRoot.hGetAgentPrinc());
                         vExportedModels.add(vRoot.hGetAgentPrinc());
                         //On exporte...
-                        ((IWAgentAvecResultat) vExportAgent).hGetResultat(pDialog, pArguments).hWriteValue(pWriter);
+                        ((IWAgentComputor) vExportAgent).computeAsData(pDialog, pArguments).writeValue(pWriter);
                     }
                 }
@@ -218 +218 @@
             if (vLink instanceof IWAgentAvecLiens) {
                 IWAgent vInternalizedAgent = ((IWAgent) vLink).hGetAgentAssoc("internalized");
-                String vLinkInternalized = (vInternalizedAgent == null) ? "userDependent" : ((IWAgentAvecResultat) vInternalizedAgent).hGetResultat(pDialog, null).hGetValue();
+                String vLinkInternalized = (vInternalizedAgent == null) ? "userDependent" : ((IWAgentComputor) vInternalizedAgent).computeAsData(pDialog, null).getString();
                 //On évalue si ce lien peut pointer un modèle exportable en fonction du filtre.
                 boolean vIsLinkAllowInternalizable = !vLinkInternalized.equals("never");
@@ -233 +233 @@
                                 if (pFilter == 1) {
                                     IWAgent vCheckModeModelAgent = vListModels[i].hGetAgentAssoc("isStandAloneItem");
-                                    vFilterOk = (vCheckModeModelAgent == null) || ((IWAgentAvecResultat) vCheckModeModelAgent).hGetResultat(pDialog, pArguments).hGetValue().equals("true");
+                                    vFilterOk = (vCheckModeModelAgent == null) || ((IWAgentComputor) vCheckModeModelAgent).computeAsData(pDialog, pArguments).getString().equals("true");
                                 } else if (pFilter == 2) {
                                     IWAgent vCheckModeModelAgent = vListModels[i].hGetAgentAssoc("isInternalizable");
-                                    vFilterOk = (vCheckModeModelAgent == null) || ((IWAgentAvecResultat) vCheckModeModelAgent).hGetResultat(pDialog, pArguments).hGetValue().equals("true");
+                                    vFilterOk = (vCheckModeModelAgent == null) || ((IWAgentComputor) vCheckModeModelAgent).computeAsData(pDialog, pArguments).getString().equals("true");
                                 }
                                 if (vFilterOk) {
                                     //Le modèle pointé respecte les conditions du filtre
                                     IWAgent vExportAgent = vListModels[i].hGetAgentParRef(pPathAgent);
-                                    if (vExportAgent != null && (vExportAgent instanceof IWAgentAvecResultat)) {
+                                    if (vExportAgent != null && (vExportAgent instanceof IWAgentComputor)) {
                                         //On exporte...
-                                        ((IWAgentAvecResultat) vExportAgent).hGetResultat(pDialog, pArguments).hWriteValue(pWriter);
+                                        ((IWAgentComputor) vExportAgent).computeAsData(pDialog, pArguments).writeValue(pWriter);
                                     }
                                 }
@@ -253 +253 @@
                                     //On parcourt les lien de cet item qui peuvent être internalisé.
                                     IWAgent vIsInternalizableModel = vListModels[i].hGetAgentAssoc("isInternalizable");
-                                    vAnalyze = (vIsInternalizableModel == null || ((IWAgentAvecResultat) vIsInternalizableModel).hGetResultat(pDialog, null).hGetValue().equals("true"));
+                                    vAnalyze = (vIsInternalizableModel == null || ((IWAgentComputor) vIsInternalizableModel).computeAsData(pDialog, null).getString().equals("true"));
                                 }
                                 if (vAnalyze) {

trunk/Jav_Builder/com/scenari/m/builder/gen/XedNsPage.java

@@ -47 +47 @@
 
 import com.scenari.m.co.dialog.IHDialog;
-import com.scenari.m.co.donnee.IHDonnee;
+import com.scenari.m.co.donnee.IData;
 import com.scenari.m.ge.agent.pages.HDialogPages;
 import com.scenari.m.ge.context.HContextGenerator;
@@ -86 +86 @@
         try {
             //On calcule le content
-            pDialogPage.hGetPageCourante().hGetZone("mainZone").hWriteValue(fWriterBuf, pDialogPage, pDialogPage.hGetAgent(), pDialogPage.hGetParam());
+            pDialogPage.hGetPageCourante().hGetZone("mainZone").writeValue(fWriterBuf, pDialogPage, pDialogPage.hGetAgent(), pDialogPage.hGetParam());
             //On ajoute les infos de la page dans les buffers.
             addInfo2NsBuffer(pDialogPage);
@@ -155 +155 @@
             String vCode = (String) vEntry.getKey();
             if (vCode.length() > BUFFER_XED_DECLARE_NS.length() && vCode.charAt(BUFFER_XED_DECLARE_NS.length()) == ':' && vCode.startsWith(BUFFER_XED_DECLARE_NS)) {
-                vBuffer.add(((IHDonnee) vEntry.getValue()).hGetValue(pDialogPage, pDialogPage.hGetAgent(), null));
+                vBuffer.add(((IData) vEntry.getValue()).getString(pDialogPage, pDialogPage.hGetAgent(), null));
             }
         }

trunk/Jav_Builder/com/scenari/m/builder/gen/XhtmlWmTemplatePage.java

@@ -159 +159 @@
                 ArrayList vXslBuffers = new ArrayList();
                 vXslBuffers.add("mainZone");
-                String vListPostXsl = pDialogPage.hGetPageCourante().hGetZone("listPostXsl").hGetValue(pDialogPage, pDialogPage.hGetAgent(), pDialogPage.hGetParam());
+                String vListPostXsl = pDialogPage.hGetPageCourante().hGetZone("listPostXsl").getString(pDialogPage, pDialogPage.hGetAgent(), pDialogPage.hGetParam());
                 ZXPathListXml.parseList(vListPostXsl, vXslBuffers);
 
@@ -186 +186 @@
                 try {
                         //On calcule le content
-                        pDialogPage.hGetPageCourante().hGetZone("mainZone").hWriteValue(fWriterBuf, pDialogPage, pDialogPage.hGetAgent(), null);
+                        pDialogPage.hGetPageCourante().hGetZone("mainZone").writeValue(fWriterBuf, pDialogPage, pDialogPage.hGetAgent(), null);
                         //On publie le resultat en resolvant les buffers.
                         fWriterBuf.hWriteIn(pWriter);