JBoss Tools SVN: r14415 - trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-04-01 16:01:22 -0400 (Wed, 01 Apr 2009)
New Revision: 14415
Modified:
trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/feature.xml
Log:
add org.jboss.tools.flow.jpdl4.multipage to the feature
Modified: trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/feature.xml
===================================================================
--- trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/feature.xml 2009-04-01 20:00:27 UTC (rev 14414)
+++ trunk/jbpm/features/org.jboss.tools.flow.jpdl4.feature/feature.xml 2009-04-01 20:01:22 UTC (rev 14415)
@@ -102,4 +102,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.tools.flow.jpdl4.multipage"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
15 years, 1 month
JBoss Tools SVN: r14414 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-04-01 16:00:27 -0400 (Wed, 01 Apr 2009)
New Revision: 14414
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage/META-INF/MANIFEST.MF
Log:
change plugin ID to org.jboss.tools.flow.jpdl4.multipage
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage/META-INF/MANIFEST.MF 2009-04-01 19:54:28 UTC (rev 14413)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage/META-INF/MANIFEST.MF 2009-04-01 20:00:27 UTC (rev 14414)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.jboss.tools.flow.jpdl4.multipageeditor;singleton:=true
+Bundle-SymbolicName: org.jboss.tools.flow.jpdl4.multipage;singleton:=true
Bundle-Version: 1.0.0
Bundle-Activator: org.jboss.tools.flow.jpdl4.multipage.MultiPageEditorPlugin
Bundle-Vendor: %providerName
15 years, 1 month
JBoss Tools SVN: r14413 - trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-04-01 15:54:28 -0400 (Wed, 01 Apr 2009)
New Revision: 14413
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage/plugin.xml
Log:
make the editor open on the jpdl4 content type
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage/plugin.xml 2009-04-01 19:53:56 UTC (rev 14412)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4.multipage/plugin.xml 2009-04-01 19:54:28 UTC (rev 14413)
@@ -11,7 +11,10 @@
extensions="xml"
icon="icons/process.gif"
id="org.jboss.tools.flow.jpdl4.multipage.editors.MultiPageEditor"
- name="jBPM Graphical Process Designer">
+ name="jBPM jPDL4 Editor">
+ <contentTypeBinding
+ contentTypeId="org.jboss.tools.flow.jpdl4">
+ </contentTypeBinding>
</editor>
</extension>
15 years, 1 month
JBoss Tools SVN: r14412 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: src/org/jboss/tools/flow/jpdl4/editor and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-04-01 15:53:56 -0400 (Wed, 01 Apr 2009)
New Revision: 14412
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java
Log:
serialization/deserialization of assignee, candidate-groups and swimlane expressions
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-04-01 19:24:12 UTC (rev 14411)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-04-01 19:53:56 UTC (rev 14412)
@@ -215,7 +215,7 @@
point="org.eclipse.ui.newWizards">
<category
id="org.jboss.tools.flow.jpdl4"
- name="jBPM">
+ name="JBoss jBPM">
</category>
<wizard
category="org.jboss.tools.flow.jpdl4"
@@ -268,12 +268,12 @@
<extension point="org.eclipse.ui.views.properties.tabbed.propertySections">
<propertySections contributorId="org.jboss.tools.flow.jpdl4.editor">
- <propertySection
+<!-- <propertySection
class="org.jboss.tools.flow.jpdl4.properties.AdvancedSection"
id="org.jboss.tools.jpdl4.advanced"
tab="org.jboss.tools.jpdl4.advanced">
<input type="java.lang.Object"/>
- </propertySection>
+ </propertySection> -->
<propertySection
class="org.jboss.tools.flow.jpdl4.properties.NameSection"
id="org.jboss.tools.jpdl4.name"
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2009-04-01 19:24:12 UTC (rev 14411)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2009-04-01 19:53:56 UTC (rev 14412)
@@ -16,6 +16,7 @@
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
import org.jboss.tools.flow.common.wrapper.Wrapper;
import org.jboss.tools.flow.jpdl4.Logger;
+import org.jboss.tools.flow.jpdl4.model.HumanTask;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -60,6 +61,36 @@
}
}
+ class HumanTaskAttributeHandler extends NodeAttributeHandler {
+ public void deserializeAttributes(Wrapper wrapper, Element element) {
+ super.deserializeAttributes(wrapper, element);
+ String assignee = element.getAttribute(HumanTask.ASSIGNEE);
+ if (!"".equals(assignee)) {
+ wrapper.setPropertyValue(
+ HumanTask.ASSIGNMENT_TYPE,
+ HumanTask.getAssignmentTypesIndex(HumanTask.ASSIGNEE));
+ wrapper.setPropertyValue(HumanTask.ASSIGNMENT_EXPRESSION, assignee);
+ return;
+ }
+ String candidateGroups = element.getAttribute(HumanTask.CANDIDATE_GROUPS);
+ if (!"".equals(candidateGroups)) {
+ wrapper.setPropertyValue(
+ HumanTask.ASSIGNMENT_TYPE,
+ HumanTask.getAssignmentTypesIndex(HumanTask.CANDIDATE_GROUPS));
+ wrapper.setPropertyValue(HumanTask.ASSIGNMENT_EXPRESSION, candidateGroups);
+ return;
+ }
+ String swimlane = element.getAttribute(HumanTask.SWIMLANE);
+ if (!"".equals(swimlane)) {
+ wrapper.setPropertyValue(
+ HumanTask.ASSIGNMENT_TYPE,
+ HumanTask.getAssignmentTypesIndex(HumanTask.SWIMLANE));
+ wrapper.setPropertyValue(HumanTask.ASSIGNMENT_EXPRESSION, swimlane);
+ return;
+ }
+ }
+ }
+
class ConnectionAttributeHandler extends DefaultAttributeDeserializer {
public void deserializeAttributes(Wrapper wrapper, Element element) {
super.deserializeAttributes(wrapper, element);
@@ -187,13 +218,22 @@
if (wrapper instanceof FlowWrapper) {
return new ProcessAttributeHandler();
} else if (wrapper instanceof NodeWrapper) {
- return new NodeAttributeHandler();
+ return getNodeAttributeHandler(wrapper);
} else if (wrapper instanceof ConnectionWrapper) {
return new ConnectionAttributeHandler();
}
return null;
}
+ private AttributeDeserializer getNodeAttributeHandler(Wrapper wrapper) {
+ Object element = wrapper.getElement();
+ if (element instanceof HumanTask) {
+ return new HumanTaskAttributeHandler();
+ } else {
+ return new NodeAttributeHandler();
+ }
+ }
+
private ChildNodeDeserializer getChildNodeHandler(Wrapper wrapper) {
if (wrapper instanceof FlowWrapper) {
return new ProcessChildNodeHandler();
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2009-04-01 19:24:12 UTC (rev 14411)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2009-04-01 19:53:56 UTC (rev 14412)
@@ -89,9 +89,6 @@
getEditDomain().addViewer(treeViewer);
getSelectionSynchronizer().addViewer(treeViewer);
detailsPage = new DetailsPage(treeViewer) ;
- if (((Wrapper)getModel()).getElement() == null) {
- System.out.println("Ha!");
- }
treeViewer.setContents(((Wrapper)getModel()).getElement());
getSite().getSelectionProvider().addSelectionChangedListener(detailsPage);
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2009-04-01 19:24:12 UTC (rev 14411)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2009-04-01 19:53:56 UTC (rev 14412)
@@ -283,21 +283,21 @@
class HumanTaskSerializer extends ProcessNodeWrapperSerializer {
protected List<String> getAttributesToSave() {
List<String> result = super.getAttributesToSave();
- result.add("assignee");
- result.add("candidate-groups");
- result.add("swimlane");
+ result.add(HumanTask.ASSIGNEE);
+ result.add(HumanTask.CANDIDATE_GROUPS);
+ result.add(HumanTask.SWIMLANE);
return result;
}
protected void appendAttributeToSave(String attributeName, StringBuffer buffer, Wrapper wrapper) {
if (!(wrapper instanceof NodeWrapper)) return;
Element element = wrapper.getElement();
if (!(element instanceof HumanTask)) return;
- if ("assignee".equals(attributeName)) {
- appendExpression("assignee", buffer, wrapper);
- } else if ("candidate-groups".equals(attributeName)) {
- appendExpression("candidate-groups", buffer, wrapper);
- } else if ("swimlane".equals(attributeName)) {
- appendExpression("swimlane", buffer, wrapper);
+ if (HumanTask.ASSIGNEE.equals(attributeName)) {
+ appendExpression(HumanTask.ASSIGNEE, buffer, wrapper);
+ } else if (HumanTask.CANDIDATE_GROUPS.equals(attributeName)) {
+ appendExpression(HumanTask.CANDIDATE_GROUPS, buffer, wrapper);
+ } else if (HumanTask.SWIMLANE.equals(attributeName)) {
+ appendExpression(HumanTask.SWIMLANE, buffer, wrapper);
} else {
super.appendAttributeToSave(attributeName, buffer, wrapper);
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java 2009-04-01 19:24:12 UTC (rev 14411)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java 2009-04-01 19:53:56 UTC (rev 14412)
@@ -24,6 +24,17 @@
ASSIGNEE, CANDIDATE_GROUPS, SWIMLANE, NONE
};
+ public static Integer getAssignmentTypesIndex(String assignmentType) {
+ Integer result = 0;
+ for (String type : ASSIGNMENT_TYPES) {
+ if (type.equals(assignmentType)) {
+ break;
+ }
+ result++;
+ }
+ return result;
+ }
+
private String assignmentType = NONE;
private String assignmentExpression = "";
private String assignmentExpressionLanguage = "";
@@ -64,17 +75,6 @@
return propertyDescriptors;
}
- private int getAssignmentTypesIndex(String assignmentType) {
- int result = 0;
- for (String type : ASSIGNMENT_TYPES) {
- if (type.equals(assignmentType)) {
- break;
- }
- result++;
- }
- return result;
- }
-
public Object getPropertyValue(Object id) {
if (ASSIGNMENT_TYPE.equals(id)) {
return getAssignmentTypesIndex(assignmentType);
15 years, 1 month
JBoss Tools SVN: r14411 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2009-04-01 15:24:12 -0400 (Wed, 01 Apr 2009)
New Revision: 14411
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java
Log:
RESOLVED - issue JBIDE-3919: Incorrect interaction of block comments with selection bar
https://jira.jboss.org/jira/browse/JBIDE-3919
RESOLVED - issue JBIDE-4114: Add feature to select #comment nodes from the Selection Bar
https://jira.jboss.org/jira/browse/JBIDE-4114
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2009-04-01 19:15:29 UTC (rev 14410)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/selbar/SelectionBar.java 2009-04-01 19:24:12 UTC (rev 14411)
@@ -32,6 +32,8 @@
import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
+import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.ui.attribute.adapter.AdapterFactory;
@@ -286,12 +288,15 @@
node = node.getParentNode();
}
+ removeNodeListenerFromAllNodes();
int elementCounter = 0;
- while (node != null && node.getNodeType() == Node.ELEMENT_NODE) {
+ while (node != null
+ && (node.getNodeType() == Node.ELEMENT_NODE || node.getNodeType() == Node.COMMENT_NODE)) {
+ addNodeListenerTo(node);
+
ToolItem item = null;
if (selBar.getItemCount() > elementCounter) {
- item = selBar.getItem(selBar.getItemCount() - elementCounter
- - 1);
+ item = selBar.getItem(selBar.getItemCount() - 1 - elementCounter);
item.setData(node);
} else {
item = new ToolItem(selBar, SWT.FLAT, 0);
@@ -303,6 +308,9 @@
elementCounter++;
node = node.getParentNode();
}
+ if (node != null && node.getNodeType() == Node.DOCUMENT_NODE) {
+ addNodeListenerTo(node);
+ }
itemCount = elementCounter;
cmpToolBar.layout();
@@ -311,6 +319,40 @@
splitter.getParent().layout(true,true);
}
+ /**
+ * List of nodes that are notifying {@link #nodeListener} when they are
+ * changed.
+ */
+ private List<INodeNotifier> nodeNotifiers = new ArrayList<INodeNotifier>();
+ /**
+ * Listener for all {@link #nodeNotifiers}
+ */
+ private NodeListener nodeListener = new NodeListener(this);
+
+ /**
+ * Adds {@link #nodeListener} to the given {@code node}.
+ *
+ * @param node the node to that the listener must be added.
+ */
+ private void addNodeListenerTo(Node node) {
+ if (node instanceof INodeNotifier) {
+ INodeNotifier notifier = (INodeNotifier) node;
+ if (notifier.getExistingAdapter(this) == null) {
+ notifier.addAdapter(nodeListener);
+ nodeNotifiers.add(notifier);
+ }
+ }
+ }
+ /**
+ * Removes {@link #nodeListener} from all nodes associated with this {@code SelectionBar}.
+ */
+ private void removeNodeListenerFromAllNodes() {
+ for (INodeNotifier notifier : nodeNotifiers) {
+ notifier.removeAdapter(nodeListener);
+ }
+ nodeNotifiers.clear();
+ }
+
protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {
Point point = selBar.computeSize(SWT.DEFAULT, hHint);
point.y = closeBar.getSize().y;
@@ -363,6 +405,8 @@
}
public void dispose() {
+ removeNodeListenerFromAllNodes();
+
if (!selBar.isDisposed()) {
for (int i = 0; i < selBar.getItemCount(); i++) {
if (!selBar.getItem(i).isDisposed()) {
@@ -439,3 +483,41 @@
return st.toString();
}
}
+
+/**
+ * Listener for nodes that are implementing {@link INodeAdapter}.
+ * Calls {@link SelectionBar#selectionChanged()} every time when these nodes are changed.
+ * <P>
+ * This class is a part of fix of JBIDE-3919:
+ * Incorrect interaction of block comments with selection bar.
+ * </P>
+ * @author yradtsevich
+ */
+class NodeListener implements INodeAdapter {
+ private SelectionBar selectionBar;
+
+ public NodeListener(SelectionBar selectionBar) {
+ this.selectionBar = selectionBar;
+ }
+
+ /* (non-javadoc)
+ * The infrastructure calls this method to determine if the adapter is
+ * appropriate for 'type'. Typically, adapters return true based on
+ * identity comparison to 'type', but this is not required, that is, the
+ * decision can be based on complex logic.
+ */
+ public boolean isAdapterForType(Object type) {
+ return selectionBar == type;
+ }
+
+ /* (non-javadoc)
+ * Sent to adapter when notifier changes. Each notifier is responsible for
+ * defining specific eventTypes, feature changed, etc.
+ *
+ * ISSUE: may be more evolvable if the argument was one big 'notifier
+ * event' instance.
+ */
+ public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
+ selectionBar.selectionChanged();
+ }
+}
15 years, 1 month
JBoss Tools SVN: r14410 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-04-01 15:15:29 -0400 (Wed, 01 Apr 2009)
New Revision: 14410
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4112 - Fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2009-04-01 18:05:19 UTC (rev 14409)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2009-04-01 19:15:29 UTC (rev 14410)
@@ -719,6 +719,9 @@
if(component.isStateless()) {
ISeamJavaComponentDeclaration javaDeclaration = component.getJavaDeclaration();
Set<ISeamComponentMethod> methods = javaDeclaration.getMethodsByType(SeamComponentMethodType.DESTROY);
+ if(methods==null) {
+ return;
+ }
for (ISeamComponentMethod method : methods) {
IMethod javaMethod = (IMethod)method.getSourceMember();
String methodName = javaMethod.getElementName();
15 years, 1 month
JBoss Tools SVN: r14409 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: src/org/jboss/tools/flow/jpdl4/editor and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-04-01 14:05:19 -0400 (Wed, 01 Apr 2009)
New Revision: 14409
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/AssignmentSection.java
Log:
serialization of assignee, candidate-groups and swimlane attributes for human task nodes
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-04-01 17:35:26 UTC (rev 14408)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-04-01 18:05:19 UTC (rev 14409)
@@ -19,7 +19,7 @@
</describer>
</content-type>
</extension>
- <extension point="org.eclipse.ui.editors">
+<!-- <extension point="org.eclipse.ui.editors">
<editor
name="jPDL4 Editor"
icon="icons/process.gif"
@@ -30,7 +30,7 @@
contentTypeId="org.jboss.tools.flow.jpdl4">
</contentTypeBinding>
</editor>
- </extension>
+ </extension> -->
<extension
point="org.jboss.tools.flow.common.languages">
<language
@@ -233,7 +233,7 @@
<propertyCategory category="general"/>
<propertyCategory category="details"/>
<propertyCategory category="graphics"/>
- <propertyCategory category="advanced"/>
+<!-- <propertyCategory category="advanced"/> -->
</propertyContributor>
</extension>
@@ -244,14 +244,15 @@
id="org.jboss.tools.jpdl4.general"
label="General"/>
<propertyTab
+ afterTab="org.jboss.tools.jpdl4.general"
category="general"
id="org.jboss.tools.jpdl4.assignment"
label="Assignment"/>
- <propertyTab
+<!-- <propertyTab
afterTab="org.jboss.tools.jpdl4.general"
category="details"
id="org.jboss.tools.jpdl4.details"
- label="Details"/>
+ label="Details"/>
<propertyTab
afterTab="org.jboss.tools.jpdl4.details"
category="graphics"
@@ -261,7 +262,7 @@
afterTab="org.jboss.tools.jpdl4.graphics"
category="advanced"
id="org.jboss.tools.jpdl4.advanced"
- label="Advanced"/>
+ label="Advanced"/> -->
</propertyTabs>
</extension>
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2009-04-01 17:35:26 UTC (rev 14408)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2009-04-01 18:05:19 UTC (rev 14409)
@@ -280,6 +280,39 @@
}
}
+ class HumanTaskSerializer extends ProcessNodeWrapperSerializer {
+ protected List<String> getAttributesToSave() {
+ List<String> result = super.getAttributesToSave();
+ result.add("assignee");
+ result.add("candidate-groups");
+ result.add("swimlane");
+ return result;
+ }
+ protected void appendAttributeToSave(String attributeName, StringBuffer buffer, Wrapper wrapper) {
+ if (!(wrapper instanceof NodeWrapper)) return;
+ Element element = wrapper.getElement();
+ if (!(element instanceof HumanTask)) return;
+ if ("assignee".equals(attributeName)) {
+ appendExpression("assignee", buffer, wrapper);
+ } else if ("candidate-groups".equals(attributeName)) {
+ appendExpression("candidate-groups", buffer, wrapper);
+ } else if ("swimlane".equals(attributeName)) {
+ appendExpression("swimlane", buffer, wrapper);
+ } else {
+ super.appendAttributeToSave(attributeName, buffer, wrapper);
+ }
+ }
+ protected void appendExpression(String type, StringBuffer buffer, Wrapper wrapper) {
+ Object assignmentType = wrapper.getPropertyValue(HumanTask.ASSIGNMENT_TYPE);
+ if (!(assignmentType instanceof Integer)) return;
+ if (type.equals(HumanTask.ASSIGNMENT_TYPES[(Integer)assignmentType])) {
+ Object value = wrapper.getPropertyValue(HumanTask.ASSIGNMENT_EXPRESSION);
+ if (value == null || "".equals(value)) return;
+ buffer.append(" " + type + "=\"" + value + "\"");
+ }
+ }
+ }
+
class ProcessWrapperSerializer extends AbstractWrapperSerializer {
public void appendOpening(StringBuffer buffer, Wrapper wrapper, int level) {
buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n");
@@ -345,7 +378,7 @@
} else if (element instanceof ServiceTask) {
new ProcessNodeWrapperSerializer().appendOpening(buffer, wrapper, level);
} else if (element instanceof HumanTask) {
- new ProcessNodeWrapperSerializer().appendOpening(buffer, wrapper, level);
+ new HumanTaskSerializer().appendOpening(buffer, wrapper, level);
} else if (element instanceof ExclusiveGateway) {
new ProcessNodeWrapperSerializer().appendOpening(buffer, wrapper, level);
} else if (element instanceof ForkParallelGateway) {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java 2009-04-01 17:35:26 UTC (rev 14408)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HumanTask.java 2009-04-01 18:05:19 UTC (rev 14409)
@@ -17,12 +17,11 @@
public static final String ASSIGNEE = "assignee";
public static final String CANDIDATE_GROUPS = "candidate-groups";
- public static final String CANDIDATE_USERS = "candidate-users";
public static final String SWIMLANE = "swimlane";
public static final String NONE = "none";
public static final String[] ASSIGNMENT_TYPES = {
- ASSIGNEE, CANDIDATE_GROUPS, CANDIDATE_USERS, SWIMLANE, NONE
+ ASSIGNEE, CANDIDATE_GROUPS, SWIMLANE, NONE
};
private String assignmentType = NONE;
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/AssignmentSection.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/AssignmentSection.java 2009-04-01 17:35:26 UTC (rev 14408)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/AssignmentSection.java 2009-04-01 18:05:19 UTC (rev 14409)
@@ -28,8 +28,8 @@
private CLabel typeLabel;
private Text expressionText;
private CLabel expressionLabel;
- private Text languageText;
- private CLabel languageLabel;
+// private Text languageText;
+// private CLabel languageLabel;
// private Composite parent;
@@ -58,8 +58,8 @@
createTypeCombo(composite);
createExpressionLabel(composite);
createExpressionText(composite);
- createLanguageLabel(composite);
- createLanguageText(composite);
+// createLanguageLabel(composite);
+// createLanguageText(composite);
}
@@ -97,22 +97,22 @@
expressionText.setLayoutData(data);
}
- private void createLanguageLabel(Composite parent) {
- languageLabel = getWidgetFactory().createCLabel(parent, "Language");
- FormData data = new FormData();
- data.left = new FormAttachment(0, 0);
- data.top = new FormAttachment(expressionText, 2);
- languageLabel.setLayoutData(data);
- }
-
- private void createLanguageText(Composite parent) {
- languageText = getWidgetFactory().createText(parent, "");
- FormData data = new FormData();
- data.top = new FormAttachment(expressionText, 0);
- data.left = new FormAttachment(0, 80);
- data.right = new FormAttachment(100, 0);
- languageText.setLayoutData(data);
- }
+// private void createLanguageLabel(Composite parent) {
+// languageLabel = getWidgetFactory().createCLabel(parent, "Language");
+// FormData data = new FormData();
+// data.left = new FormAttachment(0, 0);
+// data.top = new FormAttachment(expressionText, 2);
+// languageLabel.setLayoutData(data);
+// }
+//
+// private void createLanguageText(Composite parent) {
+// languageText = getWidgetFactory().createText(parent, "");
+// FormData data = new FormData();
+// data.top = new FormAttachment(expressionText, 0);
+// data.left = new FormAttachment(0, 80);
+// data.right = new FormAttachment(100, 0);
+// languageText.setLayoutData(data);
+// }
public void setInput(IWorkbenchPart part, ISelection selection) {
super.setInput(part, selection);
@@ -132,6 +132,7 @@
private SelectionListener typeComboSelectionListener = new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
changeProperty(HumanTask.ASSIGNMENT_TYPE, typeCombo.getSelectionIndex());
+ expressionText.setEnabled(!HumanTask.NONE.equals(typeCombo.getText()));
}
};
@@ -141,11 +142,11 @@
}
};
- private ModifyListener languageTextModifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- changeProperty(HumanTask.ASSIGNMENT_EXPRESSION_LANGUAGE, languageText.getText());
- }
- };
+// private ModifyListener languageTextModifyListener = new ModifyListener() {
+// public void modifyText(ModifyEvent e) {
+// changeProperty(HumanTask.ASSIGNMENT_EXPRESSION_LANGUAGE, languageText.getText());
+// }
+// };
protected void changeProperty(Object propertyId, Object newValue) {
if (commandStack == null || input == null) return;
@@ -161,24 +162,31 @@
protected void unhookListeners() {
typeCombo.removeSelectionListener(typeComboSelectionListener);
expressionText.removeModifyListener(expressionTextModifyListener);
- languageText.removeModifyListener(languageTextModifyListener);
+// languageText.removeModifyListener(languageTextModifyListener);
}
protected void hookListeners() {
typeCombo.addSelectionListener(typeComboSelectionListener);
expressionText.addModifyListener(expressionTextModifyListener);
- languageText.addModifyListener(languageTextModifyListener);
+// languageText.addModifyListener(languageTextModifyListener);
}
protected void updateValues() {
if (input == null) {
typeCombo.setText(HumanTask.NONE);
+ expressionText.setEnabled(false);
expressionText.setText("");
- languageText.setText("");
+// languageText.setText("");
} else {
typeCombo.setText(HumanTask.ASSIGNMENT_TYPES[(Integer)input.getPropertyValue(HumanTask.ASSIGNMENT_TYPE)]);
- expressionText.setText((String)input.getPropertyValue(HumanTask.ASSIGNMENT_EXPRESSION));
- languageText.setText((String)input.getPropertyValue(HumanTask.ASSIGNMENT_EXPRESSION_LANGUAGE));
+ if (HumanTask.NONE.equals(typeCombo.getText())) {
+ expressionText.setEnabled(false);
+ expressionText.setText("");
+ } else {
+ expressionText.setEnabled(true);
+ expressionText.setText((String)input.getPropertyValue(HumanTask.ASSIGNMENT_EXPRESSION));
+// languageText.setText((String)input.getPropertyValue(HumanTask.ASSIGNMENT_EXPRESSION_LANGUAGE));
+ }
}
}
15 years, 1 month
JBoss Tools SVN: r14407 - trunk/jbpm/docs/converter_ref.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2009-04-01 13:34:17 -0400 (Wed, 01 Apr 2009)
New Revision: 14407
Modified:
trunk/jbpm/docs/converter_ref/pom.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-690 PDF version building problem. FOP version should be changed in all poms of all guides.
Modified: trunk/jbpm/docs/converter_ref/pom.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/pom.xml 2009-04-01 17:31:59 UTC (rev 14406)
+++ trunk/jbpm/docs/converter_ref/pom.xml 2009-04-01 17:34:17 UTC (rev 14407)
@@ -74,7 +74,13 @@
<artifactId>jbosstools-docbook-xslt</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop</artifactId>
+ <version>0.95</version>
+ </dependency>
+ </dependencies>
+
<configuration>
<sourceDocumentName>master.xml</sourceDocumentName>
<sourceDirectory>${pom.basedir}/en</sourceDirectory>
@@ -146,5 +152,6 @@
<cssdir>../../../documentation/jbosstools-jdocbook-style/src/main/org/css/</cssdir>
<translation>en-US</translation>
</properties>
-
+
+
</project>
15 years, 1 month
JBoss Tools SVN: r14406 - in trunk/jbpm/docs/converter_ref/en: modules and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2009-04-01 13:31:59 -0400 (Wed, 01 Apr 2009)
New Revision: 14406
Modified:
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_7.png
trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_8.png
trunk/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-686 BPMN Convert User Guide update
Modified: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_7.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/converter_ref/en/images/bpmnconvert_bpmn2jpdl_8.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml
===================================================================
--- trunk/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml 2009-04-01 16:16:50 UTC (rev 14405)
+++ trunk/jbpm/docs/converter_ref/en/modules/bpmn2jpdl.xml 2009-04-01 17:31:59 UTC (rev 14406)
@@ -86,17 +86,9 @@
<para>Click on the <property>Next</property> button.</para>
</listitem>
<listitem>
- <para>In this page, you may get error or warning messages that occurred during the conversion. If there are no messages, this page is skipped.
+ <para>On the next page, you may get error or warning messages that occurred during the conversion. If there are no messages, this page is skipped.
</para>
- <figure>
- <title>Show Messages</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/bpmnconvert_bpmn2jpdl_6.png"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
- <para>Click on the <property>Next</property> button.</para>
+ <para>Click on the <property>Next</property> button.</para>
</listitem>
<listitem>
<para>Select the target location to save the generated JPDL files.
@@ -111,7 +103,7 @@
</figure>
<itemizedlist>
<listitem>
- <para>Overwrite existing resources: if you don't want to overwrite existing resources, please keep uncheck this checkbox.</para>
+ <para>If you'd like to overwrite existing resources,check this "Overwrite existing resources" checkbox.</para>
</listitem>
</itemizedlist>
<para>Click on the <property>Finish</property> button.</para>
@@ -126,8 +118,9 @@
<imagedata fileref="images/bpmnconvert_bpmn2jpdl_8.png"></imagedata>
</imageobject>
</mediaobject>
- </figure>
+ </figure>
+ <para>We hope, this guide helped you to get started with the JBoss BPMN Convert module. Besides, for additional information you are welcome on <ulink
+ url="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">JBoss forum</ulink>.</para>
</section>
-
-
+
</chapter>
\ No newline at end of file
15 years, 1 month