Changeset 15100

Timestamp:

03/15/10 18:40:45 (2 years ago)

Author:

anp

Message:

compil builder : création des SS limitée aux models dont le owner est le rootModel

File:

• branches/3.7.x/Jav_Builder/com/scenari/m/builder/gen/HModelGenerator.java (modified) (4 diffs)

branches/3.7.x/Jav_Builder/com/scenari/m/builder/gen/HModelGenerator.java

@@ -1749 +1749 @@
                         wAddDialog((IWADialogExport) vAg.hNewDialog(fRootDialog));
                 }
-
-                xListAllSs(new ArrayList(), new ArrayList(), fRootDialog.hGetAgent());
+                
+                String vOwnerPath = fRootDialog.hGetAgent().hGetAgentPath();
+                xListAllSs(new ArrayList(), new ArrayList(), fRootDialog.hGetAgent(), vOwnerPath);
 
                 // On traite toutes les pages des SS.
@@ -1769 +1770 @@
          * @throws Exception
          */
-        protected void xListAllSs(List pAnalyzedModels, List pExportedModels, IWAgent pModelAgent) throws Exception {
+        protected void xListAllSs(List pAnalyzedModels, List pExportedModels, IWAgent pModelAgent, String pOwnerPath) throws Exception {
                 IWAgent vAg = pModelAgent.hGetAgentAssoc("links");
+                IWAgentComputor vFindOwnerAgent = (IWAgentComputor) fRootDialog.hGoToAgent("@@/findOwnerClass");
                 if (vAg == null) return;
                 Element vListLinks = vAg.hGetElementRoot();
@@ -1792 +1794 @@
                                                                         IWAgent vSsAgent = vListModels[i].hGetAgentAssoc("ss");
                                                                         if (vSsAgent != null && (vSsAgent instanceof IWAgentExport) && vSsAgent.hIsActif(fRootDialog)) {
-                                                                                wAddDialog((IWADialogExport) vSsAgent.hNewDialog(fRootDialog));
+                                                                                if (vFindOwnerAgent == null || pOwnerPath == null || (vFindOwnerAgent.computeAsString(fRootDialog, vListModels[i].hGetCode()).equals(pOwnerPath))) {
+                                                                                        wAddDialog((IWADialogExport) vSsAgent.hNewDialog(fRootDialog));
+                                                                                }
                                                                         }
                                                                 }
@@ -1799 +1803 @@
                                                                 pAnalyzedModels.add(vListModels[i]);
                                                                 // On parcourt les lien de cet item.
-                                                                xListAllSs(pAnalyzedModels, pExportedModels, vListModels[i]);
+                                                                xListAllSs(pAnalyzedModels, pExportedModels, vListModels[i], pOwnerPath);
                                                         }
                                                 }