Author: scabanovich Date: 2008-12-29 08:47:04 -0500 (Mon, 29 Dec 2008) New Revision: 12836 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java Log: JBIDE-3466 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-12-29 12:55:41 UTC (rev 12835) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-12-29 13:47:04 UTC (rev 12836) @@ -2891,6 +2891,7 @@ <XChildEntity maxCount="1" name="SeamPageRaiseEvent20"/> <XChildEntity maxCount="1" name="SeamPageRender"/> <XChildEntity maxCount="1" name="SeamPageRedirect21"/> + <XChildEntity name="SeamPageRule21"/> </XChildrenEntities> <XEntityRenderer> <ICONS> @@ -2920,6 +2921,18 @@ <AttributeData AttributeName="value"/> </EntityData> </XActionItem> + <XActionItem + HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.AddRuleHandler" + ICON="action.empty" + PROPERTIES="validator.add=true;entity=SeamPageRule21;renderEntity=SeamPageRender;redirectEntity=SeamPageRedirect21;key=SeamPage_AddRule" + WizardClassName="%Default%" displayName="Add Rule..." kind="action" name="AddRule"> + <EntityData EntityName="AddSeamPageRule"> + <AttributeData AttributeName="kind" Mandatory="no"/> + <AttributeData AttributeName="view id"/> + <AttributeData AttributeName="if outcome" Mandatory="no"/> + <AttributeData AttributeName="if" Mandatory="no"/> + </EntityData> + </XActionItem> </XActionItem> <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/> <XActionItem HIDE="disabled" Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-12-29 12:55:41 UTC (rev 12835) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-12-29 13:47:04 UTC (rev 12836) @@ -106,12 +106,14 @@ if(!entity.startsWith(ENT_NAVIGATION)) continue; if(entity.startsWith(ENT_NAVIGATION_RULE)) { addTarget(ns[j], true); - } else { - XModelObject[] rs = ns[j].getChildren(); - for (int k = 0; k < rs.length; k++) { - addTarget(rs[k], true); + if(!entity.endsWith(SUFF_21)) { + continue; } } + XModelObject[] rs = ns[j].getChildren(); + for (int k = 0; k < rs.length; k++) { + addTarget(rs[k], true); + } } } @@ -303,16 +305,19 @@ if(result == null) result = new ArrayList<XModelObject>(); result.add(t); } - } else { - XModelObject[] rs = ns[i].getChildren(); - for (int k = 0; k < rs.length; k++) { - XModelObject t = getTargetChild(rs[k]); - if(t != null) { - if(result == null) result = new ArrayList<XModelObject>(); - result.add(t); - } + if(!entity.endsWith(SUFF_21)) { + continue; } } + XModelObject[] rs = ns[i].getChildren(); + for (int k = 0; k < rs.length; k++) { + XModelObject t = getTargetChild(rs[k]); + if (t != null) { + if (result == null) result = new ArrayList<XModelObject>(); + result.add(t); + } + } + } return result == null ? new XModelObject[0] : result.toArray(new XModelObject[0]);