JBoss Tools SVN: r10146 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-09-08 11:50:26 -0400 (Mon, 08 Sep 2008)
New Revision: 10146
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java
Log:
Fixed JBIDE-1605
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java 2008-09-08 15:50:22 UTC (rev 10145)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuGroupTemplate.java 2008-09-08 15:50:26 UTC (rev 10146)
@@ -156,28 +156,37 @@
nsIDOMDocument visualDocument) {
Element groupSourceElement = (Element) sourceNode;
+ Element srcNode = null;
+
+ if ((groupSourceElement.getUserData(VpeVisualDomBuilder.SRC_NODE) != null)
+ && (groupSourceElement.getUserData(VpeVisualDomBuilder.SRC_NODE) instanceof Element)) {
+ srcNode = (Element) groupSourceElement.getUserData(VpeVisualDomBuilder.SRC_NODE);
+ }
nsIDOMElement creationDataDiv = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_DIV);
VpeCreationData creationData = new VpeCreationData(creationDataDiv);
+ //added by estherbin fixed https://jira.jboss.org/jira/browse/JBIDE-1605 issue.
+ final Element elementToPass = (srcNode != null ? srcNode : groupSourceElement);
- expandedIds = (List<String>) sourceNode.getUserData(VPE_EXPANDED_TOGGLE_IDS);
- String childId = (String) sourceNode.getUserData(VpeVisualDomBuilder.VPE_USER_TOGGLE_ID);
+ expandedIds = (List<String>) elementToPass.getUserData(VPE_EXPANDED_TOGGLE_IDS);
+ String childId = (String) elementToPass.getUserData(VpeVisualDomBuilder.VPE_USER_TOGGLE_ID);
/*
* Counts child groups in a parent group
*/
int childGroupCount = 1;
+
+
+ Element anySuitableParent = getGroupParent(elementToPass, false);
+ Element panelMenuParent = getGroupParent(elementToPass, true);
- Element anySuitableParent = getGroupParent(groupSourceElement, false);
- Element panelMenuParent = getGroupParent(groupSourceElement, true);
-
readPanelMenuGroupAttributes(groupSourceElement);
readPanelMenuAttributes(panelMenuParent);
-
+
ComponentUtil.setCSSLink(pageContext, STYLE_PATH, NAME_COMPONENT);
boolean expanded = false;
if (null != expandedIds) {
- expanded = expandedIds.contains(childId);
+ expanded = expandedIds.contains(childId);
}
nsIDOMElement div = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_DIV);
@@ -191,8 +200,15 @@
nsIDOMElement childSpan = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_SPAN);
VpeChildrenInfo childrenInfo = new VpeChildrenInfo(childSpan);
-
- List<Node> children = ComponentUtil.getChildren(groupSourceElement);
+
+
+ List<Node> children = null;
+
+ if (srcNode != null) {
+ children = ComponentUtil.getChildren((Element) groupSourceElement.getUserData(VpeVisualDomBuilder.SRC_NODE));
+ } else {
+ children = ComponentUtil.getChildren(groupSourceElement);
+ }
if (expanded) {
for (Node child : children) {
boolean isGroup = child.getNodeName().endsWith(
@@ -486,13 +502,14 @@
private static final Element getGroupParent(Element sourceElement,
boolean findOnlyPanelMenuParent) {
Element parent = (Element) sourceElement.getParentNode();
+
while (true) {
if (findOnlyPanelMenuParent) {
- if (parent.getNodeName().endsWith(PANEL_MENU_END_TAG)) {
+ if ((parent!=null) && parent.getNodeName().endsWith(PANEL_MENU_END_TAG)) {
break;
}
} else {
- if (parent.getNodeName().endsWith(PANEL_MENU_END_TAG)
+ if ((parent!=null) && parent.getNodeName().endsWith(PANEL_MENU_END_TAG)
|| parent.getNodeName().endsWith(
PANEL_MENU_GROUP_END_TAG)) {
break;
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java 2008-09-08 15:50:22 UTC (rev 10145)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java 2008-09-08 15:50:26 UTC (rev 10146)
@@ -16,6 +16,7 @@
import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
import org.jboss.tools.jsf.vpe.richfaces.HtmlComponentUtil;
import org.jboss.tools.vpe.editor.VpeSourceDomBuilder;
+import org.jboss.tools.vpe.editor.VpeVisualDomBuilder;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
@@ -127,13 +128,24 @@
.createElement(HtmlComponentUtil.HTML_TAG_DIV);
VpeCreationData creationData = new VpeCreationData(creationDataDiv);
Element itemSourceElement = (Element) sourceNode;
- String childId = (String) sourceNode.getUserData(VPE_PANEL_MENU_ITEM_ID);
+ Element srcElement = null;
+ //added by estherbin fixed https://jira.jboss.org/jira/browse/JBIDE-1605
+ if ((itemSourceElement.getUserData(VpeVisualDomBuilder.SRC_NODE) != null)
+ && (itemSourceElement.getUserData(VpeVisualDomBuilder.SRC_NODE) instanceof Element)) {
+ srcElement = (Element) itemSourceElement.getUserData(VpeVisualDomBuilder.SRC_NODE);
+ }
+
ComponentUtil.setCSSLink(pageContext, STYLE_PATH, COMPONENT_NAME);
-
- Element anySuitableParent = getItemParent(itemSourceElement, false);
- Element panelMenuParent = getItemParent(itemSourceElement, true);
+ //added by estherbin fixed https://jira.jboss.org/jira/browse/JBIDE-1605
+ final Element elementToPass = ((srcElement != null) ? srcElement : itemSourceElement);
+
+ Element anySuitableParent = getItemParent(elementToPass, false);
+ Element panelMenuParent = getItemParent(elementToPass, true);
+
+ String childId = (String) elementToPass.getUserData(VPE_PANEL_MENU_ITEM_ID);
+
readPanelMenuAttributes(panelMenuParent);
readPanelMenuItemAttributes(itemSourceElement);
17 years, 7 months
JBoss Tools SVN: r10145 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-09-08 11:50:22 -0400 (Mon, 08 Sep 2008)
New Revision: 10145
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
Fixed JBIDE-1605
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-09-08 15:23:19 UTC (rev 10144)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-09-08 15:50:22 UTC (rev 10145)
@@ -100,6 +100,7 @@
/**
*
*/
+ public static final String SRC_NODE = "SRC_NODE"; //$NON-NLS-1$
public static final String PARENT = "PARENT"; //$NON-NLS-1$
public static final String VPE_USER_TOGGLE_ID = "vpe-user-toggle-id"; //$NON-NLS-1$
public static final String VPE_USER_TOGGLE_LOOKUP_PARENT = "vpe-user-toggle-lookup-parent"; //$NON-NLS-1$
@@ -449,6 +450,9 @@
Attr a = ((Element)sourceNodeClone).getAttributeNode(PARENT);
a.setUserData(PARENT, sourceNode.getParentNode(),null);
+ //added by estherbin fix https://jira.jboss.org/jira/browse/JBIDE-1605 issue.
+ sourceNodeClone.setUserData(SRC_NODE, sourceNode,null);
+
}
template.beforeTemplateCreated(getPageContext(),
sourceNodeClone, getVisualDocument());
17 years, 7 months
JBoss Tools SVN: r10144 - trunk/smooks/features/org.jboss.tools.smooks.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-09-08 11:23:19 -0400 (Mon, 08 Sep 2008)
New Revision: 10144
Added:
trunk/smooks/features/org.jboss.tools.smooks.feature/.project
trunk/smooks/features/org.jboss.tools.smooks.feature/build.properties
trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml
Log:
Share project "org.jboss.tools.smooks.feature" into "https://svn.jboss.org/repos/jbosstools"
Added: trunk/smooks/features/org.jboss.tools.smooks.feature/.project
===================================================================
--- trunk/smooks/features/org.jboss.tools.smooks.feature/.project (rev 0)
+++ trunk/smooks/features/org.jboss.tools.smooks.feature/.project 2008-09-08 15:23:19 UTC (rev 10144)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.smooks.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/smooks/features/org.jboss.tools.smooks.feature/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/features/org.jboss.tools.smooks.feature/build.properties
===================================================================
--- trunk/smooks/features/org.jboss.tools.smooks.feature/build.properties (rev 0)
+++ trunk/smooks/features/org.jboss.tools.smooks.feature/build.properties 2008-09-08 15:23:19 UTC (rev 10144)
@@ -0,0 +1 @@
+bin.includes = feature.xml
Property changes on: trunk/smooks/features/org.jboss.tools.smooks.feature/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml
===================================================================
--- trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml (rev 0)
+++ trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml 2008-09-08 15:23:19 UTC (rev 10144)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.smooks.feature"
+ label="Feature Feature"
+ version="1.0.0"
+ provider-name="JBoss, a division of Red Hat">
+
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
+
+ <copyright url="http://www.example.com/copyright">
+ [Enter Copyright Description here.]
+ </copyright>
+
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
+
+ <plugin
+ id="org.jboss.tools.smooks.graphicalInfo"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.smooks.javabean"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.smooks.model"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.smooks.model.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.smooks.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.smooks.xml"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.smooks.xml2java"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Property changes on: trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 7 months
JBoss Tools SVN: r10142 - trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-09-08 11:01:07 -0400 (Mon, 08 Sep 2008)
New Revision: 10142
Removed:
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBCorePlugin.java
Log:
Deleted: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBCorePlugin.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBCorePlugin.java 2008-09-08 14:20:02 UTC (rev 10141)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBCorePlugin.java 2008-09-08 15:01:07 UTC (rev 10142)
@@ -1,50 +0,0 @@
-package org.jboss.tools.esb.core;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class ESBCorePlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.esb.core";
-
- // The shared instance
- private static ESBCorePlugin plugin;
-
- /**
- * The constructor
- */
- public ESBCorePlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static ESBCorePlugin getDefault() {
- return plugin;
- }
-
-}
17 years, 7 months
JBoss Tools SVN: r10141 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-09-08 10:20:02 -0400 (Mon, 08 Sep 2008)
New Revision: 10141
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2678 Ctrl + Click EL expressions containing brackets
issue is fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-09-08 13:11:01 UTC (rev 10140)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2008-09-08 14:20:02 UTC (rev 10141)
@@ -1003,6 +1003,10 @@
for (TypeInfoCollector.MemberInfo info : javaElementInfosToFilter) {
// We do expect nothing but name for method tokens (No round brackets)
String filter = token.getText();
+ if (token.getType() == ELOperandToken.EL_METHOD_TOKEN) {
+ if (filter.indexOf('(') >=0)
+ filter = filter.substring(0, filter.indexOf('('));
+ }
// This is used for validation.
if (info.getName().equals(filter)) {
javaElements.add(info.getJavaElement());
17 years, 7 months
JBoss Tools SVN: r10140 - in workspace/grid/org.jboss.tools.bpmnTo: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-09-08 09:11:01 -0400 (Mon, 08 Sep 2008)
New Revision: 10140
Modified:
workspace/grid/org.jboss.tools.bpmnTo/.project
workspace/grid/org.jboss.tools.bpmnTo/META-INF/MANIFEST.MF
Log:
improve the codes
Modified: workspace/grid/org.jboss.tools.bpmnTo/.project
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/.project 2008-09-08 13:09:03 UTC (rev 10139)
+++ workspace/grid/org.jboss.tools.bpmnTo/.project 2008-09-08 13:11:01 UTC (rev 10140)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.bpmnTo</name>
+ <name>org.jboss.tools.bpmnto</name>
<comment></comment>
<projects>
</projects>
Modified: workspace/grid/org.jboss.tools.bpmnTo/META-INF/MANIFEST.MF
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/META-INF/MANIFEST.MF 2008-09-08 13:09:03 UTC (rev 10139)
+++ workspace/grid/org.jboss.tools.bpmnTo/META-INF/MANIFEST.MF 2008-09-08 13:11:01 UTC (rev 10140)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.jboss.tools.bpmnTo;singleton:=true
+Bundle-SymbolicName: org.jboss.tools.bpmnto;singleton:=true
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Bundle-Activator: org.jboss.tools.bpmnto.BpmnToPlugin
17 years, 7 months
JBoss Tools SVN: r10139 - in workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools: b2j/translate and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2008-09-08 09:09:03 -0400 (Mon, 08 Sep 2008)
New Revision: 10139
Modified:
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2J.properties
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2JMessages.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/TranslateHelper.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/action/BpmnToAction.java
workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/DomXmlWriter.java
Log:
add support for bpmn transaction
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2J.properties
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2J.properties 2008-09-08 07:49:28 UTC (rev 10138)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2J.properties 2008-09-08 13:09:03 UTC (rev 10139)
@@ -28,7 +28,13 @@
Bpmn_GeneratedFile_Location_Dialog_Title=Select the generated files location
Bpmn_Translate_Message_Dialog_Title=Warnings and Errors
Bpmn_Translate_Message_Dialog_Message=The messages are errors and warnings during the translation:
+Bpmn_EAnnotations_Element_Name=eAnnotations
+Bpmn_Details_Element_Name=details
+Bpmn_Value_Attribute_Name=value
Jpdl_Suffix=jpdl
+Jpdl_Element_Decision_Suffix=Decision
+Jpdl_Element_Complete_Suffix=Complete
+Jpdl_Element_Cancel_Suffix=Cancel
Jpdl_Process_Definition_Name=processdefinition.xml
Jpdl_32_Namespace_Url=urn:jbpm.org:jpdl-3.2
Jpdl_Process_Definition_Element_Name=process-definition
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2JMessages.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2JMessages.java 2008-09-08 07:49:28 UTC (rev 10138)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/messages/B2JMessages.java 2008-09-08 13:09:03 UTC (rev 10139)
@@ -52,6 +52,13 @@
public static String Bpmn_GeneratedFile_Location_Dialog_Title;
public static String Bpmn_Translate_Message_Dialog_Title;
public static String Bpmn_Translate_Message_Dialog_Message;
+ public static String Bpmn_EAnnotations_Element_Name;
+ public static String Bpmn_Details_Element_Name;
+ public static String Bpmn_Value_Attribute_Name;
+ public static String Jpdl_Element_Decision_Suffix;
+ public static String Jpdl_Element_Complete_Suffix;
+ public static String Jpdl_Element_Cancel_Suffix;
+ public static String Jpdl_Element_Successful_Name;
public static String Jpdl_Suffix;
public static String Jpdl_Process_Definition_Name;
public static String Jpdl_ProcessState_Element_Name;
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java 2008-09-08 07:49:28 UTC (rev 10138)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/BPMN2JPDL.java 2008-09-08 13:09:03 UTC (rev 10139)
@@ -12,8 +12,8 @@
package org.jboss.tools.b2j.translate;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashMap;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -29,10 +29,10 @@
*
* this is a translator for bpmn ->jpdl
*/
-public class BPMN2JPDL extends BPMNTranslator{
+public class BPMN2JPDL extends BPMNTranslator {
Document bpmnDocument;
- List<Document> processDefs = new LinkedList<Document>();
+ List<Document> processDefs = new ArrayList<Document>();
Map<String, Element> map = new HashMap<String, Element>();
public Map<String, Element> getMap() {
@@ -53,7 +53,7 @@
public BPMN2JPDL(String bpmnFileName, String bpmnFilePath,
List<String> poolIDList, Document bpmnDocument) {
- super(bpmnFileName, bpmnFilePath, poolIDList);
+ super(bpmnFileName, bpmnFilePath, poolIDList);
this.bpmnDocument = bpmnDocument;
}
@@ -290,9 +290,89 @@
B2JMessages.Jpdl_SubProcess_Element_Name);
DomXmlWriter.mapAttribute(ele, B2JMessages.Dom_Element_Name,
processRoot);
+
+ // translate the transaction of subprocess
+ Element eAnnot = subProcess
+ .element(B2JMessages.Bpmn_EAnnotations_Element_Name);
+ if (eAnnot != null) {
+ Element details = eAnnot
+ .element(B2JMessages.Bpmn_Details_Element_Name);
+ if (details != null
+ && "true"
+ .equals(details
+ .attributeValue(B2JMessages.Bpmn_Value_Attribute_Name))) {
+ translateTransaction(processRoot);
+ }
+ }
}
/*
+ * translate a transaction of sub process
+ */
+ private void translateTransaction(Element processRoot) {
+ List<Element> lastEleList = TranslateHelper.locateLastElements(processRoot);
+
+ if (lastEleList.size() == 0) {
+ return;
+ }
+ // create a decision
+ Element decision = DomXmlWriter.addElement(processRoot,
+ B2JMessages.Jpdl_Decision_Element_Name);
+
+ DomXmlWriter.addAttribute(decision, B2JMessages.Dom_Element_Name,
+ B2JMessages.Jpdl_Element_Successful_Name);
+ // get bpmn id from map
+ String bpmnId = null;
+ for (String key : map.keySet()) {
+ if (map.get(key) == lastEleList.get(0)) {
+ bpmnId = key;
+ break;
+ }
+ }
+ map.put(bpmnId + B2JMessages.Jpdl_Element_Decision_Suffix, decision);
+
+ // create a transition from element to decision
+ for (Element ele : lastEleList) {
+ Element transition = DomXmlWriter.addElement(ele,
+ B2JMessages.Jpdl_Transition_Element);
+ transition.addAttribute(B2JMessages.Dom_Element_Name, ele
+ .attributeValue(B2JMessages.Dom_Element_Name)
+ + B2JMessages.To + B2JMessages.Jpdl_Decision_Element_Name);
+ transition.addAttribute(B2JMessages.To, decision
+ .attributeValue(B2JMessages.Dom_Element_Name));
+ }
+
+ // create a complete element
+ Element complete = DomXmlWriter.addElement(processRoot,
+ B2JMessages.Jpdl_Node_Element_Name);
+ DomXmlWriter.addAttribute(complete, B2JMessages.Dom_Element_Name,
+ B2JMessages.Jpdl_Element_Complete_Suffix);
+ map.put(bpmnId + B2JMessages.Jpdl_Element_Complete_Suffix, complete);
+
+ // create a cancel element
+ Element cancel = DomXmlWriter.addElement(processRoot,
+ B2JMessages.Jpdl_Node_Element_Name);
+ DomXmlWriter.addAttribute(cancel, B2JMessages.Dom_Element_Name,
+ B2JMessages.Jpdl_Element_Cancel_Suffix);
+ map.put(bpmnId + B2JMessages.Jpdl_Element_Cancel_Suffix, cancel);
+
+ // create transition from decision to complete element
+ Element toComplete = DomXmlWriter.addElement(decision,
+ B2JMessages.Jpdl_Transition_Element);
+ toComplete.addAttribute(B2JMessages.Dom_Element_Name, "true");
+ toComplete.addAttribute(B2JMessages.To, complete
+ .attributeValue(B2JMessages.Dom_Element_Name));
+
+ // create transition from decision to cancel element
+ Element toCancel = DomXmlWriter.addElement(decision,
+ B2JMessages.Jpdl_Transition_Element);
+ toCancel.addAttribute(B2JMessages.Dom_Element_Name, "false");
+ toCancel.addAttribute(B2JMessages.To, cancel
+ .attributeValue(B2JMessages.Dom_Element_Name));
+ }
+
+
+ /*
* Translate bpmn sequenceflows to jpdl transitions
*/
private void translateSequenceFlows(Element graph, Element processRoot) {
@@ -358,7 +438,7 @@
Element first = DomXmlWriter.addElement(element,
B2JMessages.Jpdl_Transition_Element);
first.addAttribute(B2JMessages.Dom_Element_Name, B2JMessages.To
- + B2JMessages.Space + name);
+ + B2JMessages.Underline + name);
first.addAttribute(B2JMessages.To, decision
.attributeValue(B2JMessages.Dom_Element_Name));
@@ -366,7 +446,7 @@
Element second = DomXmlWriter.addElement(decision,
B2JMessages.Jpdl_Transition_Element);
second.addAttribute(B2JMessages.Dom_Element_Name, B2JMessages.To
- + B2JMessages.Space
+ + B2JMessages.Underline
+ element.attributeValue(B2JMessages.Dom_Element_Name));
second.addAttribute(B2JMessages.To, element
.attributeValue(B2JMessages.Dom_Element_Name));
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java 2008-09-08 07:49:28 UTC (rev 10138)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/GraphicalFileGenerator.java 2008-09-08 13:09:03 UTC (rev 10139)
@@ -13,7 +13,7 @@
import java.io.IOException;
import java.util.HashMap;
-import java.util.LinkedList;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -25,19 +25,19 @@
import org.jboss.tools.b2j.messages.B2JMessages;
/**
- * @author Grid Qian
+ * @author Grid Qian
*
- * this is a translator for bpmn_diagram to gpd of jpdl
+ * this is a translator for bpmn_diagram to gpd of jpdl
*/
-public class GraphicalFileGenerator extends BPMNTranslator{
-
+public class GraphicalFileGenerator extends BPMNTranslator {
+
Document document;
// gpd.xml documents list
- List<Document> gpdDefs = new LinkedList<Document>();
-
+ List<Document> gpdDefs = new ArrayList<Document>();
+
// the pool of gpd.xml name
- List<String> gpdPoolNames = new LinkedList<String>();
+ List<String> gpdPoolNames = new ArrayList<String>();
Map<String, Element> map = new HashMap<String, Element>();
public GraphicalFileGenerator(Document bpmnDiagramDocument,
@@ -114,22 +114,57 @@
for (String bpmnID : map.keySet()) {
if (bpmnID != null) {
// when translate bpmn loop activity, we create a mock
- // structure.
- // For this reason, we need to give a (x,y) increment to avoid
+ // structure and when translate bpmn transaction, we create a
+ // mock
+ // structure too. For these reason, we need to give a (x,y)
+ // increment to avoid
// two element overlap
int xIncre = 0;
int yIncre = 0;
Element bpmnGpdEle = TranslateHelper.getDiagramLayoutElement(
bpmnID, eleList);
- if (bpmnGpdEle == null
- && bpmnID
- .endsWith(B2JMessages.Bpmn_Vertice_Element_Name)) {
- bpmnGpdEle = TranslateHelper.getDiagramLayoutElement(
- TranslateHelper.getPureBpmnID(bpmnID,
- B2JMessages.Bpmn_Vertice_Element_Name),
- eleList);
- xIncre = 50;
- yIncre = 50;
+ if (bpmnGpdEle == null) {
+ if (bpmnID.endsWith(B2JMessages.Bpmn_Vertice_Element_Name)) {
+ bpmnGpdEle = TranslateHelper.getDiagramLayoutElement(
+ TranslateHelper.getPureBpmnID(bpmnID,
+ B2JMessages.Bpmn_Vertice_Element_Name),
+ eleList);
+ xIncre = 150;
+ yIncre = 50;
+ } else if (bpmnID
+ .endsWith(B2JMessages.Jpdl_Element_Decision_Suffix)) {
+ bpmnGpdEle = TranslateHelper
+ .getDiagramLayoutElement(
+ TranslateHelper
+ .getPureBpmnID(
+ bpmnID,
+ B2JMessages.Jpdl_Element_Decision_Suffix),
+ eleList);
+ xIncre = 150;
+ yIncre = 100;
+ } else if (bpmnID
+ .endsWith(B2JMessages.Jpdl_Element_Complete_Suffix)) {
+ bpmnGpdEle = TranslateHelper
+ .getDiagramLayoutElement(
+ TranslateHelper
+ .getPureBpmnID(
+ bpmnID,
+ B2JMessages.Jpdl_Element_Complete_Suffix),
+ eleList);
+ xIncre = 300;
+ yIncre = 0;
+ } else if (bpmnID
+ .endsWith(B2JMessages.Jpdl_Element_Cancel_Suffix)) {
+ bpmnGpdEle = TranslateHelper
+ .getDiagramLayoutElement(
+ TranslateHelper
+ .getPureBpmnID(
+ bpmnID,
+ B2JMessages.Jpdl_Element_Cancel_Suffix),
+ eleList);
+ xIncre = 300;
+ yIncre = 200;
+ }
}
if (bpmnGpdEle == null) {
continue;
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/TranslateHelper.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/TranslateHelper.java 2008-09-08 07:49:28 UTC (rev 10138)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/b2j/translate/TranslateHelper.java 2008-09-08 13:09:03 UTC (rev 10139)
@@ -13,6 +13,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -125,7 +126,35 @@
return isOk;
}
+
+ /*
+ * select the elements from process. These elements have no transitions sub
+ * element or have transtions to end-state.
+ */
+ public static List<Element> locateLastElements(Element processRoot) {
+ List<Element> list = new ArrayList<Element>();
+ if (processRoot.element(B2JMessages.Jpdl_End_Element_Name) != null) {
+ Element endState = processRoot.element(B2JMessages.Jpdl_End_Element_Name);
+ for (Object ele : processRoot.elements()) {
+ Element subEle = ((Element) ele).element(B2JMessages.Jpdl_Transition_Element);
+ if (subEle != null
+ && endState.attributeValue(B2JMessages.Dom_Element_Name).equals(
+ subEle.attributeValue(B2JMessages.To))) {
+ list.add((Element) ele);
+ }
+ }
+ } else {
+ for (Object ele : processRoot.elements()) {
+ if (((Element) ele).element(B2JMessages.Jpdl_Transition_Element) == null) {
+ list.add((Element) ele);
+ }
+ }
+ }
+
+ return list;
+ }
+
/*
* get the layout element from bpmn_diagram file by id
*/
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/action/BpmnToAction.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/action/BpmnToAction.java 2008-09-08 07:49:28 UTC (rev 10138)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/action/BpmnToAction.java 2008-09-08 13:09:03 UTC (rev 10139)
@@ -1,7 +1,6 @@
package org.jboss.tools.bpmnto.action;
import java.util.ArrayList;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -116,7 +115,7 @@
if (dialog.open() == Window.OK) {
selected = dialog.getResult();
}
- List<String> list = new LinkedList<String>();
+ List<String> list = new ArrayList<String>();
if (selected == null) {
return list;
}
Modified: workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/DomXmlWriter.java
===================================================================
--- workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/DomXmlWriter.java 2008-09-08 07:49:28 UTC (rev 10138)
+++ workspace/grid/org.jboss.tools.bpmnTo/src/org/jboss/tools/bpmnto/util/DomXmlWriter.java 2008-09-08 13:09:03 UTC (rev 10139)
@@ -12,7 +12,7 @@
package org.jboss.tools.bpmnto.util;
import java.io.*;
-import java.util.LinkedList;
+import java.util.ArrayList;
import java.util.List;
import org.dom4j.*;
@@ -95,7 +95,7 @@
* get a named element from a element (any depth)
*/
public static List<Element> getElementsByName(Element element, String name) {
- List<Element> list = new LinkedList<Element>();
+ List<Element> list = new ArrayList<Element>();
for (Object ele : element.elements()) {
if (name.equals(((Element) ele).getName())) {
list.add((Element) ele);
17 years, 7 months
JBoss Tools SVN: r10138 - trunk/smooks/plugins/org.jboss.tools.smooks.javabean.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-08 03:49:28 -0400 (Mon, 08 Sep 2008)
New Revision: 10138
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml
Log:
delete some testing extension points fragments
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml 2008-09-08 07:16:43 UTC (rev 10137)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml 2008-09-08 07:49:28 UTC (rev 10138)
@@ -34,41 +34,5 @@
name="JavaBean TargetModel Analyzer"
typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean">
</targetModelAnalyzer>
- <sourceModelAnalyzer
- class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer"
- level="0"
- name="Javaa12"
- typeID="org.jboss.tools.smooks.ui.viewerInitor.jadavabean">
- </sourceModelAnalyzer>
- <sourceModelAnalyzer
- class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer"
- level="0"
- name="421a"
- typeID="org.jboss.tools.smooks.ui.viea123nitor.javabean">
- </sourceModelAnalyzer>
- <sourceModelAnalyzer
- class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer"
- level="0"
- name="yyy"
- typeID="org.jboss.tools.sm55555555555555555">
- </sourceModelAnalyzer>
- <targetModelAnalyzer
- class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer"
- level="0"
- name="zer"
- typeID="org.jboss.tools.smooks.ui.viewerInitor.javabea1">
- </targetModelAnalyzer>
- <targetModelAnalyzer
- class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer"
- level="0"
- name="J512"
- typeID="org.jb1">
- </targetModelAnalyzer>
- <targetModelAnalyzer
- class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer"
- level="0"
- name="55t"
- typeID="o5114141">
- </targetModelAnalyzer>
</extension>
</plugin>
17 years, 7 months
JBoss Tools SVN: r10137 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2008-09-08 03:16:43 -0400 (Mon, 08 Sep 2008)
New Revision: 10137
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
Log:
fix a bug : Get data form NULL TreeItem
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-08 06:54:26 UTC (rev 10136)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksGraphicalFormPage.java 2008-09-08 07:16:43 UTC (rev 10137)
@@ -446,6 +446,7 @@
Class<? extends Object> modelClass) {
for (int i = 0; i < items.length; i++) {
TreeItem item = (TreeItem) items[i];
+ if(item == null) continue;
if (item.getData(REFERENCE_MODEL) != null) {
} else {
@@ -810,7 +811,7 @@
wizard.setForcePreviousAndNextButtons(true);
StructuredDataCreationWizardDailog dialog = new StructuredDataCreationWizardDailog(
getEditorSite().getShell(), wizard);
- if (dialog.open() == Dialog.OK) {
+ if (dialog.open() == WizardDialog.OK) {
IStrucutredDataCreationWizard cw = dialog
.getCurrentCreationWizard();
String typeID = cw.getInputDataTypeID();
17 years, 7 months