Author: scabanovich Date: 2008-05-27 11:45:13 -0400 (Tue, 27 May 2008) New Revision: 8375 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages.properties 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/SeamPagesEntityRecognizer.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesProcessHelper.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesUpdateManager.java Log: Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2008-05-27 15:43:12 UTC (rev 8374) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2008-05-27 15:45:13 UTC (rev 8375) @@ -18,6 +18,8 @@ </extension> <extension point="org.jboss.tools.common.model.classes"> + <xclass id="org.jboss.tools.seam.pages.xml.model.FileSeamPageImpl" + class="org.jboss.tools.seam.pages.xml.model.FileSeamPageImpl"/> <xclass id="org.jboss.tools.seam.pages.xml.model.FileSeamPagesImpl" class="org.jboss.tools.seam.pages.xml.model.FileSeamPagesImpl"/> <xclass id="org.jboss.tools.seam.pages.xml.model.SeamPagesFileLoader" Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages.properties 2008-05-27 15:43:12 UTC (rev 8374) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages.properties 2008-05-27 15:45:13 UTC (rev 8375) @@ -0,0 +1,2 @@ +FileSeamPage12.editorTitle=Seam Page Editor +FileSeamPage20.editorTitle=Seam Page Editor \ No newline at end of file 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-05-27 15:43:12 UTC (rev 8374) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-05-27 15:45:13 UTC (rev 8375) @@ -5,8 +5,8 @@ <VERSION DEPENDS="Model:1.0" MODULE="Struts Editor" VERSION="1.0"/> <MAPPINGS> <MAPPING name="FileVersions"> - <PAIR name="SeamPage_1.2" value="FileSeamPages12"/> - <PAIR name="SeamPage_2.0" value="FileSeamPages20"/> + <PAIR name="SeamPage_1.2" value="FileSeamPage12"/> + <PAIR name="SeamPage_2.0" value="FileSeamPage20"/> <PAIR name="SeamPages1.2" value="FileSeamPages12"/> <PAIR name="SeamPages2.0" value="FileSeamPages20"/> </MAPPING> @@ -384,6 +384,21 @@ <XModelAttribute default="xml" name="extension" xmlname="EXTENSION"> <Editor name="Uneditable"/> </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" + name="no conversation view id" xmlname="no-conversation-view-id"> + <Constraint loader="Tree"> + <value name="JSFPageTree"/> + <value name="extensions=jsp,html,htm,xhtml,xml"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="login view id" xmlname="login-view-id"> + <Constraint loader="Tree"> + <value name="JSFPageTree"/> + <value name="extensions=jsp,html,htm,xhtml,xml"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -532,8 +547,9 @@ <XModelAttribute default="xml" name="extension" xmlname="EXTENSION"> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttributeReference attributes="no conversation view id" - entity="SeamPage12" name="page"/> + <XModelAttributeReference + attributes="no conversation view id,login view id" + entity="FileSeamPages12" name="page2"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -685,8 +701,16 @@ <XModelAttribute default="page" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="id=true;category=general" name="view id" xmlname="view-id"/> - <XModelAttribute TRIM="no" name="action" visibility="false" xmlname="action"/> + <XModelAttribute PROPERTIES="category=general;id=true" name="view id" xmlname="view-id"> + <Constraint loader="Tree"> + <value name="JSFPageTree"/> + <value name="extensions=jsp,html,htm,xhtml,xml"/> + <value name="linkAction=OpenPage"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=general" TRIM="no" + name="action" xmlname="action"/> <XModelAttribute PROPERTIES="category=advanced" name="switch" xmlname="switch"> <Constraint loader="ListString"> <value/> @@ -696,7 +720,13 @@ <Editor name="ListString"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced" - name="no conversation view id" xmlname="no-conversation-view-id"/> + name="no conversation view id" xmlname="no-conversation-view-id"> + <Constraint loader="Tree"> + <value name="JSFPageTree"/> + <value name="extensions=jsp,html,htm,xhtml,xml"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced" default="default(false)" name="conversation required" xmlname="conversation-required"> <Constraint loader="ListString"> @@ -1494,6 +1524,7 @@ displayName="Page..." kind="action" name="AddPage"> <EntityData EntityName="SeamPage12"> <AttributeData AttributeName="view id"/> + <AttributeData AttributeName="action" Mandatory="no"/> </EntityData> </XActionItem> </XActionItem> @@ -1544,6 +1575,7 @@ displayName="Page..." kind="action" name="AddPage"> <EntityData EntityName="SeamPage20"> <AttributeData AttributeName="view id"/> + <AttributeData AttributeName="action" Mandatory="no"/> </EntityData> </XActionItem> </XActionItem> @@ -2227,7 +2259,14 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true" default="target" name="name" visibility="false"/> - <XModelAttribute PROPERTIES="category=general" name="view id" xmlname="view-id"/> + <XModelAttribute PROPERTIES="category=general" name="view id" xmlname="view-id"> + <Constraint loader="Tree"> + <value name="JSFPageTree"/> + <value name="extensions=jsp,html,htm,xhtml,xml"/> + <value name="linkAction=OpenPage"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -2293,7 +2332,14 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true" default="target" name="name" visibility="false"/> - <XModelAttribute PROPERTIES="category=general" name="view id" xmlname="view-id"/> + <XModelAttribute PROPERTIES="category=general" name="view id" xmlname="view-id"> + <Constraint loader="Tree"> + <value name="JSFPageTree"/> + <value name="extensions=jsp,html,htm,xhtml,xml"/> + <value name="linkAction=OpenPage"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -2358,7 +2404,14 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true" default="target" name="name" visibility="false"/> - <XModelAttribute PROPERTIES="category=general" name="view id" xmlname="view-id"/> + <XModelAttribute PROPERTIES="category=general" name="view id" xmlname="view-id"> + <Constraint loader="Tree"> + <value name="JSFPageTree"/> + <value name="extensions=jsp,html,htm,xhtml,xml"/> + <value name="linkAction=OpenPage"/> + </Constraint> + <Editor name="TreeChooser"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java 2008-05-27 15:43:12 UTC (rev 8374) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesEntityRecognizer.java 2008-05-27 15:45:13 UTC (rev 8375) @@ -32,6 +32,7 @@ public String getEntityName(String ext, String body) { if(body == null) return null; if(body.indexOf(PUBLIC_ID_12) >= 0) { + if(body.indexOf("<page") > 0 && body.indexOf("<pages") < 0) return ENT_FILE_SEAM_PAGE_12; return ENT_FILE_SEAM_PAGES_12; } if(!isPagesSchema(body)) { Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesProcessHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesProcessHelper.java 2008-05-27 15:43:12 UTC (rev 8374) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesProcessHelper.java 2008-05-27 15:45:13 UTC (rev 8375) @@ -300,7 +300,7 @@ for (int i = 0; i < cases.length && i < outputs.length; i++) { ReferenceObject r = (ReferenceObject)outputs[i]; if(r.getReference() == cases[i]) continue; - String pp = cases[i].getPathPart(); + String pp = cases[i].getAttributeValue(ATTR_VIEW_ID); String id = outputs[i].getAttributeValue(ATTR_ID); if(!pp.equals(id)) return false; } @@ -309,7 +309,7 @@ private XModelObject createOutput(XModelObject item, XModelObject rulecase) { XModelObject output = item.getModel().createModelObject(ENT_PROCESS_ITEM_OUTPUT, null); - output.setAttributeValue(ATTR_ID, rulecase.getPathPart()); + output.setAttributeValue(ATTR_ID, rulecase.getAttributeValue(ATTR_VIEW_ID)); output.setAttributeValue(ATTR_PATH, rulecase.getAttributeValue(ATTR_VIEW_ID)); String name = XModelObjectUtil.createNewChildName("output", item); output.setAttributeValue(ATTR_NAME, name); @@ -321,7 +321,7 @@ if(output.isUpToDate()) return; output.notifyUpdate(); XModelObject rulecase = output.getReference(); - output.setAttributeValue(ATTR_ID, rulecase.getPathPart()); + output.setAttributeValue(ATTR_ID, rulecase.getAttributeValue(ATTR_VIEW_ID)); String path = rulecase.getAttributeValue(ATTR_VIEW_ID); output.setAttributeValue(ATTR_PATH, path); // String title = SeamPagesProcessStructureHelper.createItemOutputPresentation(rulecase); Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesUpdateManager.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesUpdateManager.java 2008-05-27 15:43:12 UTC (rev 8374) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesUpdateManager.java 2008-05-27 15:45:13 UTC (rev 8375) @@ -6,7 +6,7 @@ public class SeamPagesUpdateManager extends WebProcessUpdateManager { public static synchronized SeamPagesUpdateManager getInstance(XModel model) { - SeamPagesUpdateManager instance = (SeamPagesUpdateManager)model.getManager("JSFUpdateManager"); + SeamPagesUpdateManager instance = (SeamPagesUpdateManager)model.getManager("SeamPagesUpdateManager"); if (instance == null) { instance = new SeamPagesUpdateManager(); model.addManager("SeamPagesUpdateManager", instance);