Author: scabanovich
Date: 2008-06-06 06:58:56 -0400 (Fri, 06 Jun 2008)
New Revision: 8606
Added:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/CreateSeamPagesSupport.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml
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/FileSeamPagesImpl.java
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java
Log:
JBIDE-1189
Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2008-06-06 10:35:25 UTC
(rev 8605)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2008-06-06 10:58:56 UTC
(rev 8606)
@@ -57,6 +57,8 @@
<xclass
id="org.jboss.tools.seam.pages.xml.model.impl.SeamPagesFilteredTreeConstraint"
class="org.jboss.tools.seam.pages.xml.model.impl.SeamPagesFilteredTreeConstraint"/>
+ <xclass
id="org.jboss.tools.seam.pages.xml.model.handlers.CreateSeamPagesSupport"
+ class="org.jboss.tools.seam.pages.xml.model.handlers.CreateSeamPagesSupport"/>
<xclass id="org.jboss.tools.seam.pages.xml.model.handlers.AddRuleHandler"
class="org.jboss.tools.seam.pages.xml.model.handlers.AddRuleHandler"/>
<xclass
id="org.jboss.tools.seam.pages.xml.model.handlers.AddExceptionHandler"
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-06-06
10:35:25 UTC (rev 8605)
+++
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-06-06
10:58:56 UTC (rev 8606)
@@ -3148,7 +3148,7 @@
<XActionItem displayName="Seam" kind="list"
name="Seam">
<XActionItem HandlerClassName="%SpecialWizard%"
ICON="action.new.seam.faces-config"
-
PROPERTIES="entity=FileSeamPages12;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xml;entityVersion=SeamPages"
+
PROPERTIES="entity=FileSeamPages12;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.seam.pages.xml.model.handlers.CreateSeamPagesSupport;extension=xml;entityVersion=SeamPages"
displayName="Seam Pages File..." kind="action"
name="CreateFileSeamPages">
<EntityData EntityName="NewFileWizard">
<AttributeData AttributeName="folder"/>
@@ -3188,7 +3188,7 @@
<XActionItem displayName="Seam" kind="list"
name="Seam">
<XActionItem HandlerClassName="%SpecialWizard%"
ICON="action.new.seam.faces-config"
-
PROPERTIES="entity=FileSeamPages12;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.common.model.files.handlers.CreateFileSupport;extension=xml;entityVersion=SeamPages"
+
PROPERTIES="entity=FileSeamPages12;extensions=.xml.;validator.addfile=true;support=org.jboss.tools.seam.pages.xml.model.handlers.CreateSeamPagesSupport;extension=xml;entityVersion=SeamPages"
displayName="Seam Pages File..." kind="action"
name="CreateFileSeamPages">
<EntityData EntityName="NewFileWizard">
<AttributeData AttributeName="folder"/>
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/FileSeamPagesImpl.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/FileSeamPagesImpl.java 2008-06-06
10:35:25 UTC (rev 8605)
+++
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/FileSeamPagesImpl.java 2008-06-06
10:58:56 UTC (rev 8606)
@@ -38,22 +38,22 @@
}
protected void mergeAll(XModelObject f, boolean update) throws XModelException {
- SeamPagesDiagramImpl process = (SeamPagesDiagramImpl)provideWebProcess();
- boolean b = (process != null && process.isPrepared());
- if(b) process.getHelper().addUpdateLock(this);
+ SeamPagesDiagramImpl diagram = (SeamPagesDiagramImpl)provideWebProcess();
+ boolean b = (diagram != null && diagram.isPrepared());
+ if(b) diagram.getHelper().addUpdateLock(this);
merge(f, !update);
if(b) {
- process.getHelper().removeUpdateLock(this);
- process.getHelper().updateDiagram();
+ diagram.getHelper().removeUpdateLock(this);
+ diagram.getHelper().updateDiagram();
}
- if(process != null) {
- if(!process.isPrepared()/* || update*/ || isForceLoadOn()) {
+ if(diagram != null) {
+ if(!diagram.isPrepared()/* || update*/ || isForceLoadOn()) {
XObjectLoader loader = XModelObjectLoaderUtil.getObjectLoader(this);
((WebProcessLoader)loader).reloadProcess(this);
}
- if(process.isPrepared())
- process.autolayout();
+ if(diagram.isPrepared())
+ diagram.autolayout();
}
}
Added:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/CreateSeamPagesSupport.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/CreateSeamPagesSupport.java
(rev 0)
+++
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/CreateSeamPagesSupport.java 2008-06-06
10:58:56 UTC (rev 8606)
@@ -0,0 +1,30 @@
+package org.jboss.tools.seam.pages.xml.model.handlers;
+
+import java.util.Properties;
+
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.files.handlers.CreateFileSupport;
+import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
+import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesDiagramImpl;
+
+public class CreateSeamPagesSupport extends CreateFileSupport {
+
+ public CreateSeamPagesSupport() {}
+
+ protected void execute() throws XModelException {
+ Properties p = extractStepData(0);
+ String path = p.getProperty("name");
+ path = revalidatePath(path);
+ XModelObject file = createFile(path);
+ if(file == null) return;
+
+ SeamPagesDiagramImpl diagram =
(SeamPagesDiagramImpl)file.getChildByPath(SeamPagesConstants.ELM_DIAGRAM);
+ diagram.firePrepared();
+
+// register(file.getParent(), file, p0);
+
+ open(file);
+ }
+
+}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java 2008-06-06
10:35:25 UTC (rev 8605)
+++
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java 2008-06-06
10:58:56 UTC (rev 8606)
@@ -66,19 +66,19 @@
*/
}
- private void addRuleByPageAdopt(XModelObject process, XModelObject page, Properties p)
throws XModelException {
+ private void addRuleByPageAdopt(XModelObject diagram, XModelObject page, Properties p)
throws XModelException {
String path = XModelObjectLoaderUtil.getResourcePath(page);
- XModelObject pageItem = SeamPagesDiagramHelper.getHelper(process).getPage(path);
+ XModelObject pageItem = SeamPagesDiagramHelper.getHelper(diagram).getPage(path);
if(pageItem != null) return;
boolean doNotCreateEmptyRule = false; //or read preferences, compare JSF
- pageItem = SeamPagesDiagramHelper.getHelper(process).findOrCreateItem(path, null,
TYPE_PAGE);
+ pageItem = SeamPagesDiagramHelper.getHelper(diagram).findOrCreateItem(path, null,
TYPE_PAGE);
setShape(pageItem, p);
if(doNotCreateEmptyRule) {
pageItem.setAttributeValue("persistent", "true");
pageItem.setModified(true);
} else {
- XModelObject pages = process.getParent().getChildByPath(FOLDER_PAGES);
- String suffix = getPageSuffix(process.getParent().getModelEntity().getName());
+ XModelObject pages = diagram.getParent().getChildByPath(FOLDER_PAGES);
+ String suffix = getPageSuffix(diagram.getParent().getModelEntity().getName());
XModelObject rule = pages.getModel().createModelObject(ENT_SEAM_PAGE + suffix, null);
rule.setAttributeValue(ATTR_VIEW_ID, path);
DefaultCreateHandler.addCreatedObject(pages, rule, p);
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java 2008-06-06
10:35:25 UTC (rev 8605)
+++
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java 2008-06-06
10:58:56 UTC (rev 8606)
@@ -22,8 +22,8 @@
return p;
}
- public XModelObject[] getItems(XModelObject process) {
- return process.getChildren(ENT_DIAGRAM_ITEM);
+ public XModelObject[] getItems(XModelObject diagram) {
+ return diagram.getChildren(ENT_DIAGRAM_ITEM);
}
public XModelObject[] getOutputs(XModelObject item) {
Show replies by date