Changeset 9394 for trunk/Jav_GE/com/scenari/m/ge/donnee/WDonneeNavOutline.java

Timestamp:

07/25/07 01:11:18 (5 years ago)

Author:

sys

Message:

navOutline : activation de la version complète.

File:

• trunk/Jav_GE/com/scenari/m/ge/donnee/WDonneeNavOutline.java (modified) (4 diffs)

trunk/Jav_GE/com/scenari/m/ge/donnee/WDonneeNavOutline.java

@@ -152 +152 @@
                         if (fIncludeCompType != null) {
                                 if(fCompTypeAllowed) {
-                                        String vCd = pWalker.getAgent().hGetComposant().hGetComposantType().hGetCode();
+                                        String vCd = pWalker.getAgent().hGetComposant().hGetComposantPrincipal().hGetComposantType().hGetCode();
                                         for (int i = 0; i < fIncludeCompType.length; i++) {
                                                 if (vCd.equals(fIncludeCompType[i])) return true;
@@ -158 +158 @@
                                         return false;
                                 } else {
-                                        String vCd = pWalker.getAgent().hGetComposant().hGetComposantType().hGetCode();
+                                        String vCd = pWalker.getAgent().hGetComposant().hGetComposantPrincipal().hGetComposantType().hGetCode();
                                         for (int i = 0; i < fIncludeCompType.length; i++) {
                                                 if (vCd.equals(fIncludeCompType[i])) return false;
@@ -268 +268 @@
                                 return true;
                         } else {
-                                String pUrl = pWalker.getDialogUrl();
                                 if (!pWalker.gotoPrevious()) return false;
-                                while (!isEntryAllowed(pWalker) || pUrl.equals(pWalker.getDialogUrl())) {
+                                while (!isEntryAllowed(pWalker)) {
                                         if (!pWalker.gotoPrevious()) return false;
                                 }
@@ -415 +414 @@
                 super();
                 fWalker = new OutlineWalker();
+                fWalker.setRestrictToMaterializedNode(true);
                 fWalker.setCurrDesc(OutlineWalker.NO_LIMIT, OutlineWalker.FROM_STARTINGPOINT);
                 fWalker.setUncleFrom(OutlineWalker.DIR_UP_DOWN, 0);