Author: scabanovich
Date: 2008-06-05 09:28:01 -0400 (Thu, 05 Jun 2008)
New Revision: 8583
Added:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java
Removed:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/ProcessAdopt.java
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/FileSeamPagesImpl.java
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java
Log:
JBIDE-2282
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-05 12:54:30 UTC
(rev 8582)
+++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/plugin.xml 2008-06-05 13:28:01 UTC
(rev 8583)
@@ -61,8 +61,8 @@
class="org.jboss.tools.seam.pages.xml.model.handlers.AddRuleHandler"/>
<xclass
id="org.jboss.tools.seam.pages.xml.model.handlers.AddExceptionHandler"
class="org.jboss.tools.seam.pages.xml.model.handlers.AddExceptionHandler"/>
- <xclass id="org.jboss.tools.seam.pages.xml.model.handlers.ProcessAdopt"
- class="org.jboss.tools.seam.pages.xml.model.handlers.ProcessAdopt"/>
+ <xclass id="org.jboss.tools.seam.pages.xml.model.handlers.DiagramAdopt"
+ class="org.jboss.tools.seam.pages.xml.model.handlers.DiagramAdopt"/>
<xclass id="org.jboss.tools.seam.pages.xml.model.handlers.PageAdopt"
class="org.jboss.tools.seam.pages.xml.model.handlers.PageAdopt"/>
<xclass
id="org.jboss.tools.seam.pages.xml.model.handlers.DeleteOutputHandler"
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-06-05
12:54:30 UTC (rev 8582)
+++
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/help/keys-seam-pages.properties 2008-06-05
13:28:01 UTC (rev 8583)
@@ -1,2 +1,197 @@
FileSeamPage12.editorTitle=Seam Page Editor
-FileSeamPage20.editorTitle=Seam Page Editor
\ No newline at end of file
+FileSeamPage20.editorTitle=Seam Page Editor
+
+AddSeamPageException_Properties.Title=Add Exception
+
+FileSeamPage12_Rename.WindowTitle=Rename
+FileSeamPage12_Rename.Title=
+FileSeamPage12_Rename.Message=
+
+FileSeamPage12_Properties.Title=File Seam Page
+
+FileSeamPage20_Rename.WindowTitle=Rename
+FileSeamPage20_Rename.Title=
+FileSeamPage20_Rename.Message=
+
+FileSeamPage20_Properties.Title=File Seam Page
+
+FileSeamPages12_Rename.WindowTitle=Rename
+FileSeamPages12_Rename.Title=
+FileSeamPages12_Rename.Message=
+
+FileSeamPages12_AddPage.WindowTitle=Add Page
+FileSeamPages12_AddPage.Title=Page
+
+FileSeamPages12_AddConversation.WindowTitle=Add Conversation
+FileSeamPages12_AddConversation.Title=Conversation
+
+FileSeamPages12_AddException.WindowTitle=Add Exception
+FileSeamPages12_AddException.Title=Exception
+
+FileSeamPages12_Properties.Title=File Seam Pages
+
+FileSeamPages20_Rename.WindowTitle=Rename
+FileSeamPages20_Rename.Title=
+FileSeamPages20_Rename.Message=
+
+FileSeamPages20_AddPage.WindowTitle=Add Page
+FileSeamPages20_AddPage.Title=Page
+
+FileSeamPages20_AddConversation.WindowTitle=Add Conversation
+FileSeamPages20_AddConversation.Title=Conversation
+
+FileSeamPages20_AddException.WindowTitle=Add Exception
+FileSeamPages20_AddException.Title=Exception
+
+FileSeamPages20_Properties.Title=File Seam Pages
+
+SeamPage_AddParam.WindowTitle=Add Param
+SeamPage_AddParam.Title=Param
+
+SeamPage_AddIn.WindowTitle=Add In
+SeamPage_AddIn.Title=In
+
+SeamPage_AddAction.WindowTitle=Add Action
+SeamPage_AddAction.Title=Action
+
+SeamPage_AddNavigation.WindowTitle=Add Navigation
+SeamPage_AddNavigation.Title=Navigation
+
+SeamPage_AddRule.WindowTitle=Add Navigation Rule
+SeamPage_AddRule.Title=Rule
+
+SeamPage12_Properties.Title=Seam Page
+
+SeamPage20_Properties.Title=Seam Page
+
+SeamPageAction_Properties.Title=Action
+
+SeamPageBeginConversation_Properties.Title=Begin Conversation
+
+SeamPageBeginTask_Properties.Title=Begin Task
+
+SeamPageConversation_Properties.Title=Conversation
+
+SeamPageCreateProcess_Properties.Title=Create Process
+
+SeamPageEndConversation_Properties.Title=End Conversation
+
+SeamPageEndTask_Properties.Title=End Task
+
+SeamPageException12_Properties.Title=Exception
+
+SeamPageException20_Properties.Title=Exception
+
+SeamPageFolderConversation_AddConversation.WindowTitle=Add Conversation
+SeamPageFolderConversation_AddConversation.Title=Conversation
+
+SeamPageFolderConversation_Properties.Title=Conversations Folder
+
+SeamPageFolderException12_AddException.WindowTitle=Add Exception With Redirect
+SeamPageFolderException12_AddException.Title=Exception
+
+SeamPageFolderException12_Properties.Title=Exceptions Folder
+
+SeamPageFolderException20_AddException.WindowTitle=Add Exception With Redirect
+SeamPageFolderException20_AddException.Title=Exception
+
+SeamPageFolderException20_Properties.Title=Exceptions Folder
+
+SeamPageFolderPage12_AddPage.WindowTitle=Add Page
+SeamPageFolderPage12_AddPage.Title=Page
+
+SeamPageFolderPage12_Properties.Title=Pages Folder
+
+SeamPageFolderPage20_AddPage.WindowTitle=Add Page
+SeamPageFolderPage20_AddPage.Title=Page
+
+SeamPageFolderPage20_Properties.Title=Pages Folder
+
+SeamPageHTTPError_AddMessage.WindowTitle=Add Message
+SeamPageHTTPError_AddMessage.Title=Message
+
+SeamPageHTTPError_Properties.Title=HTTP Error
+
+SeamPageIn_Properties.Title=In
+
+SeamPageMessage_Properties.Title=Message
+
+SeamPageNavigation12_Properties.Title=Navigation
+
+SeamPageNavigation20_Properties.Title=Navigation
+
+SeamPageNavigationRule12_Properties.Title=Navigation Rule
+
+SeamPageNavigationRule20_Properties.Title=Navigation Rule
+
+SeamPageOut_Properties.Title=Out
+
+SeamPageParam12_Properties.Title=Param
+
+SeamPageParam20_Properties.Title=Param
+
+SeamPageRaiseEvent20_Properties.Title=Raise Event
+
+SeamPageRedirect12_AddMessage.WindowTitle=Add Message
+SeamPageRedirect12_AddMessage.Title=Message
+
+SeamPageRedirect12_Properties.Title=Redirect
+
+SeamPageRedirect20_AddMessage.WindowTitle=Add Message
+SeamPageRedirect20_AddMessage.Title=Message
+
+SeamPageRedirect20_Properties.Title=Redirect
+
+SeamPageRender_AddMessage.WindowTitle=Add Message
+SeamPageRender_AddMessage.Title=Message
+
+SeamPageRender_Properties.Title=Render
+
+SeamPageResumeProcess_Properties.Title=Resume Process
+
+SeamPageRule_AddOut.WindowTitle=Add Out
+SeamPageRule_AddOut.Title=Out
+
+SeamPageRule12_Properties.Title=Rule
+
+SeamPageRule20_Properties.Title=Rule
+
+SeamPageStartTask_Properties.Title=Start Task
+
+SeamPagesDiagram_AddPage.WindowTitle=New Page
+SeamPagesDiagram_AddPage.Title=Page
+
+SeamPagesDiagram_AddException.WindowTitle=New Exception
+SeamPagesDiagram_AddException.Title=Exception
+
+SeamPagesDiagram_Properties.Title=Seam Pages Diagram
+
+SeamPagesDiagram_CreateComment.WindowTitle=Add Comment
+SeamPagesDiagram_CreateComment.Title=Comment
+
+SeamPagesDiagramItem_CreateRule.WindowTitle=Add Rule
+SeamPagesDiagramItem_CreateRule.Title=Rule
+
+SeamPagesDiagramItem_CreateComment.WindowTitle=Add Comment
+SeamPagesDiagramItem_CreateComment.Title=Comment
+
+SeamPagesDiagramItem_Rename_0.WindowTitle=Rename
+SeamPagesDiagramItem_Rename_0.Title=
+SeamPagesDiagramItem_Rename_0.Message=
+
+SeamPagesDiagramItem_Properties.Title=Seam Pages Diagram Item
+
+SeamPagesDiagramItemOutput_Properties.Title=Seam Pages Diagram Item Output
+
+FileFolder_CreateFileSeamPages_0.WindowTitle=Add Seam Pages File
+FileFolder_CreateFileSeamPages_0.Title=Seam Pages File
+
+FileFolder_CreateFileSeamPage_0.WindowTitle=Add Seam Page File
+FileFolder_CreateFileSeamPage_0.Title=Seam Page File
+
+FileSystemFolder_CreateFileSeamPages_0.WindowTitle=Add Seam Pages File
+FileSystemFolder_CreateFileSeamPages_0.Title=Seam Page File
+
+FileSystemFolder_CreateFileSeamPage_0.WindowTitle=Add Seam Page File
+FileSystemFolder_CreateFileSeamPage_0.Title=Seam Page 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-06-05
12:54:30 UTC (rev 8582)
+++
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/resources/meta/seam-pages.meta 2008-06-05
13:28:01 UTC (rev 8583)
@@ -715,16 +715,16 @@
<XActionItem kind="list">
<XActionItem displayName="New" group="1" kind="list"
name="CreateActions">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Param..." kind="action"
name="AddParam">
+ PROPERTIES="validator.add=true;key=SeamPage_AddParam"
+ WizardClassName="%Default%" displayName="Param..."
kind="action" name="AddParam">
<EntityData EntityName="SeamPageParam12">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="value" Mandatory="no"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="In..." kind="action" name="AddIn">
+ PROPERTIES="validator.add=true;key=SeamPage_AddIn"
+ WizardClassName="%Default%" displayName="In..."
kind="action" name="AddIn">
<EntityData EntityName="SeamPageIn">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="scope" Mandatory="no"/>
@@ -732,16 +732,17 @@
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Action..." kind="action"
name="AddAction">
+ PROPERTIES="validator.add=true;key=SeamPage_AddAction"
+ WizardClassName="%Default%" displayName="Action..."
kind="action" name="AddAction">
<EntityData EntityName="SeamPageAction">
<AttributeData AttributeName="execute"/>
<AttributeData AttributeName="if" Mandatory="no"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Navigation..." kind="action"
name="AddNavigation">
+ PROPERTIES="validator.add=true;key=SeamPage_AddNavigation"
+ WizardClassName="%Default%" displayName="Navigation..."
+ kind="action" name="AddNavigation">
<EntityData EntityName="SeamPageNavigation12">
<AttributeData AttributeName="from action"
Mandatory="no"/>
<AttributeData AttributeName="evaluate" Mandatory="no"/>
@@ -750,7 +751,7 @@
<XActionItem
HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.AddRuleHandler"
ICON="action.empty"
-
PROPERTIES="validator.add=true;entity=SeamPageNavigationRule12;renderEntity=SeamPageRender;redirectEntity=SeamPageRedirect12"
+
PROPERTIES="validator.add=true;entity=SeamPageNavigationRule12;renderEntity=SeamPageRender;redirectEntity=SeamPageRedirect12;key=SeamPage_AddRule"
WizardClassName="%Default%" displayName="Navigation Rule..."
kind="action" name="AddRule">
<EntityData EntityName="AddSeamPageRule">
@@ -827,16 +828,16 @@
<XActionItem kind="list">
<XActionItem displayName="New" group="1" kind="list"
name="CreateActions">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Param..." kind="action"
name="AddParam">
+ PROPERTIES="validator.add=true;key=SeamPage_AddParam"
+ WizardClassName="%Default%" displayName="Param..."
kind="action" name="AddParam">
<EntityData EntityName="SeamPageParam20">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="value" Mandatory="no"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="In..." kind="action" name="AddIn">
+ PROPERTIES="validator.add=true;key=SeamPage_AddIn"
+ WizardClassName="%Default%" displayName="In..."
kind="action" name="AddIn">
<EntityData EntityName="SeamPageIn">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="scope" Mandatory="no"/>
@@ -844,16 +845,17 @@
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Action..." kind="action"
name="AddAction">
+ PROPERTIES="validator.add=true;key=SeamPage_AddAction"
+ WizardClassName="%Default%" displayName="Action..."
kind="action" name="AddAction">
<EntityData EntityName="SeamPageAction">
<AttributeData AttributeName="execute"/>
<AttributeData AttributeName="if" Mandatory="no"/>
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Navigation..." kind="action"
name="AddNavigation">
+ PROPERTIES="validator.add=true;key=SeamPage_AddNavigation"
+ WizardClassName="%Default%" displayName="Navigation..."
+ kind="action" name="AddNavigation">
<EntityData EntityName="SeamPageNavigation20">
<AttributeData AttributeName="from action"
Mandatory="no"/>
<AttributeData AttributeName="evaluate" Mandatory="no"/>
@@ -862,7 +864,7 @@
<XActionItem
HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.AddRuleHandler"
ICON="action.empty"
-
PROPERTIES="validator.add=true;entity=SeamPageNavigationRule20;renderEntity=SeamPageRender;redirectEntity=SeamPageRedirect20"
+
PROPERTIES="validator.add=true;entity=SeamPageNavigationRule20;renderEntity=SeamPageRender;redirectEntity=SeamPageRedirect20;key=SeamPage_AddRule"
WizardClassName="%Default%" displayName="Navigation Rule..."
kind="action" name="AddRule">
<EntityData EntityName="AddSeamPageRule">
@@ -1836,7 +1838,7 @@
<XActionItem
HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.AddRuleHandler"
ICON="action.empty"
-
PROPERTIES="validator.add=true;entity=SeamPageRule12;renderEntity=SeamPageRender;redirectEntity=SeamPageRedirect12"
+
PROPERTIES="validator.add=true;entity=SeamPageRule12;renderEntity=SeamPageRender;redirectEntity=SeamPageRedirect12;key=SeamPage_AddRule"
WizardClassName="%Default%" displayName="Add Rule..."
kind="action" name="AddRule">
<EntityData EntityName="AddSeamPageRule">
<AttributeData AttributeName="kind" Mandatory="no"/>
@@ -1899,7 +1901,7 @@
<XActionItem
HandlerClassName="org.jboss.tools.seam.pages.xml.model.handlers.AddRuleHandler"
ICON="action.empty"
-
PROPERTIES="validator.add=true;entity=SeamPageRule20;renderEntity=SeamPageRender;redirectEntity=SeamPageRedirect20"
+
PROPERTIES="validator.add=true;entity=SeamPageRule20;renderEntity=SeamPageRender;redirectEntity=SeamPageRedirect20;key=SeamPage_AddRule"
WizardClassName="%Default%" displayName="Add Rule..."
kind="action" name="AddRule">
<EntityData EntityName="AddSeamPageRule">
<AttributeData AttributeName="kind" Mandatory="no"/>
@@ -1969,8 +1971,8 @@
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Add Out..." kind="action"
name="AddOut">
+ PROPERTIES="validator.add=true;key=SeamPageRule_AddOut"
+ WizardClassName="%Default%" displayName="Add Out..."
kind="action" name="AddOut">
<EntityData EntityName="SeamPageOut">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="scope" Mandatory="no"/>
@@ -2046,8 +2048,8 @@
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Add Out..." kind="action"
name="AddOut">
+ PROPERTIES="validator.add=true;key=SeamPageRule_AddOut"
+ WizardClassName="%Default%" displayName="Add Out..."
kind="action" name="AddOut">
<EntityData EntityName="SeamPageOut">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="scope" Mandatory="no"/>
@@ -2335,8 +2337,9 @@
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Add Param..." kind="action"
name="AddParam">
+ PROPERTIES="validator.add=true;key=SeamPage_AddParam"
+ WizardClassName="%Default%" displayName="Add Param..."
+ kind="action" name="AddParam">
<EntityData EntityName="SeamPageParam12">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="value" Mandatory="no"/>
@@ -2417,8 +2420,9 @@
</EntityData>
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Add Param..." kind="action"
name="AddParam">
+ PROPERTIES="validator.add=true;key=SeamPage_AddParam"
+ WizardClassName="%Default%" displayName="Add Param..."
+ kind="action" name="AddParam">
<EntityData EntityName="SeamPageParam20">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="value" Mandatory="no"/>
@@ -2609,8 +2613,8 @@
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Add Out..." kind="action"
name="AddOut">
+ PROPERTIES="validator.add=true;key=SeamPageRule_AddOut"
+ WizardClassName="%Default%" displayName="Add Out..."
kind="action" name="AddOut">
<EntityData EntityName="SeamPageOut">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="scope" Mandatory="no"/>
@@ -2685,8 +2689,8 @@
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
- PROPERTIES="validator.add=true" WizardClassName="%Default%"
- displayName="Add Out..." kind="action"
name="AddOut">
+ PROPERTIES="validator.add=true;key=SeamPageRule_AddOut"
+ WizardClassName="%Default%" displayName="Add Out..."
kind="action" name="AddOut">
<EntityData EntityName="SeamPageOut">
<AttributeData AttributeName="name"/>
<AttributeData AttributeName="scope" Mandatory="no"/>
@@ -2782,7 +2786,7 @@
<XDependencies/>
</XModelEntity>
<XModelEntity
-
AdoptManagerClass="org.jboss.tools.seam.pages.xml.model.handlers.ProcessAdopt"
+
AdoptManagerClass="org.jboss.tools.seam.pages.xml.model.handlers.DiagramAdopt"
ImplementingClass="org.jboss.tools.seam.pages.xml.model.impl.SeamPagesDiagramImpl"
name="SeamPagesDiagram">
<XChildrenEntities>
<XChildEntity name="SeamPagesDiagramItem"/>
@@ -2927,7 +2931,7 @@
<XActionItem
HandlerClassName="org.jboss.tools.jsf.model.handlers.JSFItemRegirectHandler"
ICON="action.new.jsf.case"
- PROPERTIES="actionpath=CreateActions/AddNavigationRule"
+ PROPERTIES="actionpath=CreateActions/AddRule"
WizardClassName="%Default%" displayName="Rule..."
kind="action" name="CreateRule"/>
<XActionItem HIDE="always"
HandlerClassName="org.jboss.tools.struts.model.handlers.CreateCommentForItemHandler"
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-05
12:54:30 UTC (rev 8582)
+++
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/FileSeamPagesImpl.java 2008-06-05
13:28:01 UTC (rev 8583)
@@ -30,7 +30,7 @@
}
protected String getProcessEntity() {
- return "SeamPagesProcess";
+ return SeamPagesConstants.ENT_DIAGRAM;
}
protected boolean hasDTD() {
Copied:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java
(from rev 8568,
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/ProcessAdopt.java)
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java
(rev 0)
+++
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/DiagramAdopt.java 2008-06-05
13:28:01 UTC (rev 8583)
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.pages.xml.model.handlers;
+
+import java.util.*;
+import org.jboss.tools.common.meta.XAdoptManager;
+import org.jboss.tools.common.meta.action.XActionInvoker;
+import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
+import org.jboss.tools.common.model.XModelException;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
+import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramHelper;
+
+public class DiagramAdopt implements XAdoptManager, SeamPagesConstants {
+
+ public void adopt(XModelObject target, XModelObject object, java.util.Properties p)
throws XModelException {
+ if(isAdoptableJSP(target, object)) {
+ adoptJSP(target, object, p);
+ } else if(isAdoptableItem(target, object)) {
+ adoptItem(target, object, p);
+ }
+ }
+
+ public boolean isAdoptable(XModelObject target, XModelObject object) {
+ if(isAdoptableJSP(target, object)) return true;
+ if(isAdoptableItem(target, object)) return true;
+ return false;
+ }
+
+ static String ADOPTABLE_JSP = "." + ENT_FILEJSP + "."
+ + ENT_FILEHTML + "."
+ + ENT_FILEXHTML + "."
+ + "FileXML" + ".";
+
+ private boolean isAdoptableJSP(XModelObject target, XModelObject object) {
+ String entity = object.getModelEntity().getName();
+ if (ADOPTABLE_JSP.indexOf("." + entity + ".") >= 0) {
+ String path = XModelObjectLoaderUtil.getResourcePath(object);
+ if (target.getModelEntity().getName().startsWith(ENT_FILE_SEAM_PAGES)) {
+ target = target.getChildByPath(ELM_DIAGRAM);
+ }
+ return SeamPagesDiagramHelper.getHelper(target).getPage(path) == null;
+ }
+ return false;
+ }
+
+ private void adoptJSP(XModelObject target, XModelObject object, Properties p) throws
XModelException {
+ if (target.getModelEntity().getName().startsWith(ENT_FILE_SEAM_PAGES)) {
+ target = target.getChildByPath(ELM_DIAGRAM);
+ }
+ addRuleByPageAdopt(target, object, p);
+/*
+ Properties runningProperties = new Properties();
+ runningProperties.put("preselectedObject", object);
+ if(p != null) runningProperties.putAll(p);
+ XActionInvoker.invoke("CreateActions.CreatePage", target,
runningProperties);
+*/
+ }
+
+ private void addRuleByPageAdopt(XModelObject process, XModelObject page, Properties p)
throws XModelException {
+ String path = XModelObjectLoaderUtil.getResourcePath(page);
+ XModelObject pageItem = SeamPagesDiagramHelper.getHelper(process).getPage(path);
+ if(pageItem != null) return;
+ boolean doNotCreateEmptyRule = false; //or read preferences, compare JSF
+ pageItem = SeamPagesDiagramHelper.getHelper(process).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 rule = pages.getModel().createModelObject(ENT_SEAM_PAGE + suffix, null);
+ rule.setAttributeValue(ATTR_VIEW_ID, path);
+ DefaultCreateHandler.addCreatedObject(pages, rule, p);
+ }
+ }
+
+ public static String getPageSuffix(String entity) {
+ if(entity.endsWith(SUFF_12)) {
+ return SUFF_12;
+ } else {
+ return SUFF_20;
+ }
+ }
+
+ public static void setShape(XModelObject group, Properties p) {
+ String x = (p == null) ? null : p.getProperty("mouse.x");
+ String y = (p == null) ? null : p.getProperty("mouse.y");
+ if(x != null && y != null) {
+ group.setAttributeValue("shape", "" + x + "," + y +
",0,0");
+ }
+ }
+
+ private boolean isAdoptableItem(XModelObject target, XModelObject object) {
+ return ENT_DIAGRAM_ITEM.equals(object.getModelEntity().getName());
+ }
+
+ private void adoptItem(XModelObject target, XModelObject object, Properties p) {
+// String path = object.getAttributeValue(ATT_PATH);
+ p.put("sample", object);
+ String type = object.getAttributeValue(ATTR_TYPE);
+ if(TYPE_PAGE.equals(type)) {
+ XActionInvoker.invoke("CreateActions.AddPage", target, p);
+ } else {
+ //TODO
+ }
+ }
+
+}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java 2008-06-05
12:54:30 UTC (rev 8582)
+++
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/PageAdopt.java 2008-06-05
13:28:01 UTC (rev 8583)
@@ -96,7 +96,7 @@
String n = path;
if(n.lastIndexOf('.') > 0) n = n.substring(0, n.lastIndexOf('.'));
if(n.lastIndexOf('/') >= 0) n = n.substring(n.lastIndexOf('/') +
1);
- String suffix = ProcessAdopt.getPageSuffix(source.getModelEntity().getName());
+ String suffix = DiagramAdopt.getPageSuffix(source.getModelEntity().getName());
XModelObject cs = source.getModel().createModelObject(ENT_NAVIGATION_RULE + suffix,
null);
XModelObject redirect =
source.getModel().createModelObject("SeamPageRedirect" + suffix, null);
redirect.setAttributeValue(ATTR_VIEW_ID, path);
Deleted:
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/ProcessAdopt.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/ProcessAdopt.java 2008-06-05
12:54:30 UTC (rev 8582)
+++
trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/ProcessAdopt.java 2008-06-05
13:28:01 UTC (rev 8583)
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at
http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.seam.pages.xml.model.handlers;
-
-import java.util.*;
-import org.jboss.tools.common.meta.XAdoptManager;
-import org.jboss.tools.common.meta.action.XActionInvoker;
-import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler;
-import org.jboss.tools.common.model.XModelException;
-import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
-import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
-import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramHelper;
-
-public class ProcessAdopt implements XAdoptManager, SeamPagesConstants {
-
- public void adopt(XModelObject target, XModelObject object, java.util.Properties p)
throws XModelException {
- if(isAdoptableJSP(target, object)) {
- adoptJSP(target, object, p);
- } else if(isAdoptableItem(target, object)) {
- adoptItem(target, object, p);
- }
- }
-
- public boolean isAdoptable(XModelObject target, XModelObject object) {
- if(isAdoptableJSP(target, object)) return true;
- if(isAdoptableItem(target, object)) return true;
- return false;
- }
-
- static String ADOPTABLE_JSP = "." + ENT_FILEJSP + "."
- + ENT_FILEHTML + "."
- + ENT_FILEXHTML + "."
- + "FileXML" + ".";
-
- private boolean isAdoptableJSP(XModelObject target, XModelObject object) {
- String entity = object.getModelEntity().getName();
- if (ADOPTABLE_JSP.indexOf("." + entity + ".") >= 0) {
- String path = XModelObjectLoaderUtil.getResourcePath(object);
- if (target.getModelEntity().getName().startsWith(ENT_FILE_SEAM_PAGES)) {
- target = target.getChildByPath(ELM_DIAGRAM);
- }
- return SeamPagesDiagramHelper.getHelper(target).getPage(path) == null;
- }
- return false;
- }
-
- private void adoptJSP(XModelObject target, XModelObject object, Properties p) throws
XModelException {
- if (target.getModelEntity().getName().startsWith(ENT_FILE_SEAM_PAGES)) {
- target = target.getChildByPath(ELM_DIAGRAM);
- }
- addRuleByPageAdopt(target, object, p);
-/*
- Properties runningProperties = new Properties();
- runningProperties.put("preselectedObject", object);
- if(p != null) runningProperties.putAll(p);
- XActionInvoker.invoke("CreateActions.CreatePage", target,
runningProperties);
-*/
- }
-
- private void addRuleByPageAdopt(XModelObject process, XModelObject page, Properties p)
throws XModelException {
- String path = XModelObjectLoaderUtil.getResourcePath(page);
- XModelObject pageItem = SeamPagesDiagramHelper.getHelper(process).getPage(path);
- if(pageItem != null) return;
- boolean doNotCreateEmptyRule = false; //or read preferences, compare JSF
- pageItem = SeamPagesDiagramHelper.getHelper(process).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 rule = pages.getModel().createModelObject(ENT_SEAM_PAGE + suffix, null);
- rule.setAttributeValue(ATTR_VIEW_ID, path);
- DefaultCreateHandler.addCreatedObject(pages, rule, p);
- }
- }
-
- public static String getPageSuffix(String entity) {
- if(entity.endsWith(SUFF_12)) {
- return SUFF_12;
- } else {
- return SUFF_20;
- }
- }
-
- public static void setShape(XModelObject group, Properties p) {
- String x = (p == null) ? null : p.getProperty("mouse.x");
- String y = (p == null) ? null : p.getProperty("mouse.y");
- if(x != null && y != null) {
- group.setAttributeValue("shape", "" + x + "," + y +
",0,0");
- }
- }
-
- private boolean isAdoptableItem(XModelObject target, XModelObject object) {
- return ENT_DIAGRAM_ITEM.equals(object.getModelEntity().getName());
- }
-
- private void adoptItem(XModelObject target, XModelObject object, Properties p) {
-// String path = object.getAttributeValue(ATT_PATH);
- p.put("sample", object);
- String type = object.getAttributeValue(ATTR_TYPE);
- if(TYPE_PAGE.equals(type)) {
- XActionInvoker.invoke("CreateActions.AddPage", target, p);
- } else {
- //TODO
- }
- }
-
-}