JBoss Tools SVN: r12670 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-12-18 08:11:10 -0500 (Thu, 18 Dec 2008)
New Revision: 12670
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessageTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessagesTemplate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-883, code adjustment for rich:message and rich:messages.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessageTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessageTemplate.java 2008-12-18 09:20:48 UTC (rev 12669)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessageTemplate.java 2008-12-18 13:11:10 UTC (rev 12670)
@@ -12,12 +12,15 @@
import java.util.HashMap;
-import org.jboss.tools.jsf.vpe.richfaces.HtmlComponentUtil;
+import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
+import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
import org.jboss.tools.vpe.editor.VpeSourceDomBuilder;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.Constants;
+import org.jboss.tools.vpe.editor.util.HTML;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMText;
@@ -32,53 +35,12 @@
*/
public class RichFacesMessageTemplate extends VpeAbstractTemplate {
- private static String VALIDATION_MESSAGE = "Validation message"; //$NON-NLS-1$
-
- protected static String PASSED_LABEL_ATTRIBUTE_NAME = "passedLabel"; //$NON-NLS-1$
- protected static String LABEL_CLASS_ATTRIBUTE_NAME = "labelClass"; //$NON-NLS-1$
- protected static String MARKER_CLASS_ATTRIBUTE_NAME = "markerClass"; //$NON-NLS-1$
- protected static String MARKER_STYLE_ATTRIBUTE_NAME = "markerStyle"; //$NON-NLS-1$
-
- protected static String ERROR_MARKER_CLASS_ATTRIBUTE_NAME = "errorMarkerClass"; //$NON-NLS-1$
- protected static String ERROR_LABEL_CLASS_ATTRIBUTE_NAME = "errorLabelClass"; //$NON-NLS-1$
- protected static String ERROR_CLASS_ATTRIBUTE_NAME = "errorClass"; //$NON-NLS-1$
-
- protected static String FATAL_MARKER_CLASS_ATTRIBUTE_NAME = "fatalMarkerClass"; //$NON-NLS-1$
- protected static String FATAL_LABEL_CLASS_ATTRIBUTE_NAME = "fatalLabelClass"; //$NON-NLS-1$
- protected static String FATAL_CLASS_ATTRIBUTE_NAME = "fatalClass"; //$NON-NLS-1$
-
- protected static String INFO_MARKER_CLASS_ATTRIBUTE_NAME = "infoMarkerClass"; //$NON-NLS-1$
- protected static String INFO_LABEL_CLASS_ATTRIBUTE_NAME = "infoLabelClass"; //$NON-NLS-1$
- protected static String INFO_CLASS_ATTRIBUTE_NAME = "infoClass"; //$NON-NLS-1$
-
- protected static String WARN_MARKER_CLASS_ATTRIBUTE_NAME = "warnMarkerClass"; //$NON-NLS-1$
- protected static String WARN_LABEL_CLASS_ATTRIBUTE_NAME = "warnLabelClass"; //$NON-NLS-1$
- protected static String WARN_CLASS_ATTRIBUTE_NAME = "warnClass"; //$NON-NLS-1$
-
+ protected static String VALIDATION_MESSAGE = "Validation message"; //$NON-NLS-1$
protected static String ERROR_MESSAGE = "Error message"; //$NON-NLS-1$
protected static String FATAL_MESSAGE = "Fatal message"; //$NON-NLS-1$
protected static String INFO_MESSAGE = "Info message"; //$NON-NLS-1$
protected static String WARNING_MESSAGE = "Warning message"; //$NON-NLS-1$
- protected String passedLabelValue;
- protected String labelClassValue;
- protected String markerClassValue;
- protected String markerStyleValue;
- protected String errorMarkerClassValue;
- protected String errorLabelClassValue;
- protected String errorClassValue;
- protected String fatalMarkerClassValue;
- protected String fatalLabelClassValue;
- protected String fatalClassValue;
- protected String infoMarkerClassValue;
- protected String infoLabelClassValue;
- protected String infoClassValue;
- protected String warnMarkerClassValue;
- protected String warnLabelClassValue;
- protected String warnClassValue;
- protected String styleValue;
- protected String styleClassValue;
-
protected static String[] markers = { "passedMarker", "errorMarker", //$NON-NLS-1$ //$NON-NLS-2$
"fatalMarker", "infoMarker", "warnMarker" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -92,71 +54,27 @@
nsIDOMDocument visualDocument) {
Element sourceElement = (Element) sourceNode;
+ final Attributes attrs = new Attributes(sourceElement);
VpeCreationData creationData;
- passedLabelValue = ((Element) sourceNode)
- .getAttribute(PASSED_LABEL_ATTRIBUTE_NAME);
- labelClassValue = ((Element) sourceNode)
- .getAttribute(LABEL_CLASS_ATTRIBUTE_NAME);
- markerClassValue = ((Element) sourceNode)
- .getAttribute(MARKER_CLASS_ATTRIBUTE_NAME);
- markerStyleValue = ((Element) sourceNode)
- .getAttribute(MARKER_STYLE_ATTRIBUTE_NAME);
-
- errorMarkerClassValue = ((Element) sourceNode)
- .getAttribute(ERROR_MARKER_CLASS_ATTRIBUTE_NAME);
- errorLabelClassValue = ((Element) sourceNode)
- .getAttribute(ERROR_LABEL_CLASS_ATTRIBUTE_NAME);
- errorClassValue = ((Element) sourceNode)
- .getAttribute(ERROR_CLASS_ATTRIBUTE_NAME);
-
- fatalMarkerClassValue = ((Element) sourceNode)
- .getAttribute(FATAL_MARKER_CLASS_ATTRIBUTE_NAME);
- fatalLabelClassValue = ((Element) sourceNode)
- .getAttribute(FATAL_LABEL_CLASS_ATTRIBUTE_NAME);
- fatalClassValue = ((Element) sourceNode)
- .getAttribute(FATAL_CLASS_ATTRIBUTE_NAME);
-
- infoMarkerClassValue = ((Element) sourceNode)
- .getAttribute(INFO_MARKER_CLASS_ATTRIBUTE_NAME);
- infoLabelClassValue = ((Element) sourceNode)
- .getAttribute(INFO_LABEL_CLASS_ATTRIBUTE_NAME);
- infoClassValue = ((Element) sourceNode)
- .getAttribute(INFO_CLASS_ATTRIBUTE_NAME);
-
- warnMarkerClassValue = ((Element) sourceNode)
- .getAttribute(WARN_MARKER_CLASS_ATTRIBUTE_NAME);
- warnLabelClassValue = ((Element) sourceNode)
- .getAttribute(WARN_LABEL_CLASS_ATTRIBUTE_NAME);
- warnClassValue = ((Element) sourceNode)
- .getAttribute(WARN_CLASS_ATTRIBUTE_NAME);
-
- styleValue = ((Element) sourceNode)
- .getAttribute(HtmlComponentUtil.HTML_STYLE_ATTR);
- styleClassValue = ((Element) sourceNode)
- .getAttribute(HtmlComponentUtil.HTML_STYLECLASS_ATTR);
-
HashMap<String, Node> facets = getFacelets(sourceElement);
if (facets.size() != 0) {
creationData = createVisualFacets(visualDocument, sourceElement,
- facets);
+ facets, attrs);
} else {
- nsIDOMElement span = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_SPAN);
+ nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN);
- if (styleValue != null && !styleValue.trim().equals("")) //$NON-NLS-1$
- span
- .setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
- styleValue);
- if (styleClassValue != null && !styleClassValue.trim().equals("")) //$NON-NLS-1$
- span.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- styleClassValue);
- if (labelClassValue != null && !labelClassValue.trim().equals("")) //$NON-NLS-1$
- span.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- labelClassValue);
-
+ if (ComponentUtil.isNotBlank(attrs.getStyleValue())) {
+ span.setAttribute(HTML.ATTR_STYLE, attrs.getStyleValue());
+ }
+ if (ComponentUtil.isNotBlank(attrs.getStyleClassValue())) {
+ span.setAttribute(HTML.ATTR_CLASS, attrs.getStyleClassValue());
+ }
+ if (ComponentUtil.isNotBlank(attrs.getLabelClassValue())) {
+ span.setAttribute(HTML.ATTR_CLASS, attrs.getLabelClassValue());
+ }
creationData = new VpeCreationData(span);
nsIDOMText passedText = visualDocument
@@ -172,21 +90,21 @@
* attribute
*
* @param pageContext
- * Contains the information on edited page.
+ * Contains the information on edited page.
* @param sourceElement
- * The current element of the source tree.
+ * The current element of the source tree.
* @param visualDocument
- * The document of the visual tree.
+ * The document of the visual tree.
* @param visualNode
- * The current node of the visual tree.
+ * The current node of the visual tree.
* @param data
- * The arbitrary data, built by a method <code>create</code>
+ * The arbitrary data, built by a method <code>create</code>
* @param name
- * Atrribute name
+ * Atrribute name
* @param value
- * Attribute value
- * @return <code>true</code> if it is required to re-create an element at
- * a modification of attribute, <code>false</code> otherwise.
+ * Attribute value
+ * @return <code>true</code> if it is required to re-create an element at a
+ * modification of attribute, <code>false</code> otherwise.
*/
public boolean isRecreateAtAttrChange(VpePageContext pageContext,
Element sourceElement, nsIDOMDocument visualDocument,
@@ -197,7 +115,7 @@
/**
*
* @param markerName
- * Marker name
+ * Marker name
* @return True if marker name correct or false
*/
protected boolean searchInMarker(String markerName) {
@@ -220,94 +138,92 @@
* @return
*/
private VpeCreationData createVisualFacets(nsIDOMDocument visualDocument,
- Element sourceElement, HashMap<String, Node> facets) {
+ Element sourceElement, HashMap<String, Node> facets,
+ Attributes attrs) {
nsIDOMElement tableHeader = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TABLE);
- tableHeader.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
- MESSAGE_STYLE);
+ .createElement(HTML.TAG_TABLE);
+ tableHeader.setAttribute(HTML.ATTR_STYLE, MESSAGE_STYLE);
VpeCreationData creationData = new VpeCreationData(tableHeader);
- nsIDOMElement tbody = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TBODY);
- tbody.setAttribute(HtmlComponentUtil.HTML_ATTR_VALIGN, "top"); //$NON-NLS-1$
+ nsIDOMElement tbody = visualDocument.createElement(HTML.TAG_TBODY);
+ tbody.setAttribute(HTML.ATTR_VALIGN, "top"); //$NON-NLS-1$
tableHeader.appendChild(tbody);
- nsIDOMElement tr = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TR);
+ nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR);
tbody.appendChild(tr);
- if (styleValue != null && !styleValue.trim().equals("")) //$NON-NLS-1$
- tableHeader.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
- styleValue);
- if (styleClassValue != null && !styleClassValue.trim().equals("")) //$NON-NLS-1$
- tableHeader.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- styleClassValue);
+ if (ComponentUtil.isNotBlank(attrs.getStyleValue())) {
+ tableHeader.setAttribute(HTML.ATTR_STYLE, attrs.getStyleValue());
+ }
+ if (ComponentUtil.isNotBlank(attrs.getStyleClassValue())) {
+ tableHeader.setAttribute(HTML.ATTR_CLASS, attrs
+ .getStyleClassValue());
+ }
for (int i = 0; i < markers.length; i++) {
if (facets.containsKey(markers[i])) {
- nsIDOMElement td = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ nsIDOMElement td = visualDocument.createElement(HTML.TAG_TD);
switch (i) {
case 0: // passed
- if (markerClassValue != null
- && !markerClassValue.trim().equals("")) //$NON-NLS-1$
- td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- markerClassValue);
- if (markerStyleValue != null
- && !markerStyleValue.trim().equals("")) //$NON-NLS-1$
- td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
- markerStyleValue);
+ if (ComponentUtil.isNotBlank(attrs.getMarkerClassValue())) {
+ td.setAttribute(HTML.ATTR_CLASS, attrs
+ .getMarkerClassValue());
+ }
+ if (ComponentUtil.isNotBlank(attrs.getMarkerStyleValue())) {
+ td.setAttribute(HTML.ATTR_STYLE, attrs
+ .getMarkerStyleValue());
+ }
break;
case 1: // error
- if (errorClassValue != null
- && !errorClassValue.trim().equals("")) //$NON-NLS-1$
- td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- errorClassValue);
- if (errorMarkerClassValue != null
- && !errorMarkerClassValue.trim().equals("")) //$NON-NLS-1$
- td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- errorMarkerClassValue);
-
+ if (ComponentUtil.isNotBlank(attrs.getErrorClassValue())) {
+ td.setAttribute(HTML.ATTR_CLASS, attrs
+ .getErrorClassValue());
+ }
+ if (ComponentUtil.isNotBlank(attrs
+ .getErrorMarkerClassValue())) {
+ td.setAttribute(HTML.ATTR_CLASS, attrs
+ .getErrorMarkerClassValue());
+ }
break;
case 2: // fatal
- if (fatalClassValue != null
- && !fatalClassValue.trim().equals("")) //$NON-NLS-1$
- td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- fatalClassValue);
-
- if (fatalMarkerClassValue != null
- && !fatalMarkerClassValue.trim().equals("")) //$NON-NLS-1$
- td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- fatalMarkerClassValue);
-
+ if (ComponentUtil.isNotBlank(attrs.getFatalClassValue())) {
+ td.setAttribute(HTML.ATTR_CLASS, attrs
+ .getFatalClassValue());
+ }
+ if (ComponentUtil.isNotBlank(attrs
+ .getFatalMarkerClassValue())) {
+ td.setAttribute(HTML.ATTR_CLASS, attrs
+ .getFatalMarkerClassValue());
+ }
break;
case 3: // info
- if (infoClassValue != null
- && !infoClassValue.trim().equals("")) //$NON-NLS-1$
- td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- infoClassValue);
- if (infoMarkerClassValue != null
- && !infoMarkerClassValue.trim().equals("")) //$NON-NLS-1$
- td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- infoMarkerClassValue);
+ if (ComponentUtil.isNotBlank(attrs.getInfoClassValue())) {
+ td.setAttribute(HTML.ATTR_CLASS, attrs
+ .getInfoClassValue());
+ }
+ if (ComponentUtil.isNotBlank(attrs
+ .getInfoMarkerClassValue())) {
+ td.setAttribute(HTML.ATTR_CLASS, attrs
+ .getInfoMarkerClassValue());
+ }
break;
case 4: // warn
- if (warnClassValue != null
- && !warnClassValue.trim().equals("")) //$NON-NLS-1$
- td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- warnClassValue);
- if (warnMarkerClassValue != null
- && !warnMarkerClassValue.trim().equals("")) //$NON-NLS-1$
- td.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- warnMarkerClassValue);
-
+ if (ComponentUtil.isNotBlank(attrs.getWarnClassValue())) {
+ td.setAttribute(HTML.ATTR_CLASS, attrs
+ .getWarnClassValue());
+ }
+ if (ComponentUtil.isNotBlank(attrs
+ .getWarnMarkerClassValue())) {
+ td.setAttribute(HTML.ATTR_CLASS, attrs
+ .getWarnMarkerClassValue());
+ }
break;
default:
break;
@@ -325,14 +241,11 @@
}
}
- nsIDOMElement td1 = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ nsIDOMElement td1 = visualDocument.createElement(HTML.TAG_TD);
- if (labelClassValue != null && !labelClassValue.trim().equals("")) //$NON-NLS-1$
- td1
- .setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- labelClassValue);
-
+ if (ComponentUtil.isNotBlank(attrs.getLabelClassValue())) {
+ td1.setAttribute(HTML.ATTR_CLASS, attrs.getLabelClassValue());
+ }
nsIDOMText passedText = visualDocument
.createTextNode(VALIDATION_MESSAGE);
tr.appendChild(td1);
@@ -364,7 +277,7 @@
if (!(nodeList.item(i) instanceof Element))
continue;
- String facetName = nodeList.item(i).getPrefix() + ":" //$NON-NLS-1$
+ String facetName = nodeList.item(i).getPrefix() + Constants.COLON
+ FACET_TAG_NAME;
if (nodeList.item(i).getNodeName().equalsIgnoreCase(facetName)
@@ -377,4 +290,164 @@
return facets;
}
+
+ class Attributes {
+
+ private String PASSED_LABEL_ATTRIBUTE_NAME = "passedLabel"; //$NON-NLS-1$
+ private String LABEL_CLASS_ATTRIBUTE_NAME = "labelClass"; //$NON-NLS-1$
+ private String MARKER_CLASS_ATTRIBUTE_NAME = "markerClass"; //$NON-NLS-1$
+ private String MARKER_STYLE_ATTRIBUTE_NAME = "markerStyle"; //$NON-NLS-1$
+
+ private String ERROR_MARKER_CLASS_ATTRIBUTE_NAME = "errorMarkerClass"; //$NON-NLS-1$
+ private String ERROR_LABEL_CLASS_ATTRIBUTE_NAME = "errorLabelClass"; //$NON-NLS-1$
+ private String ERROR_CLASS_ATTRIBUTE_NAME = "errorClass"; //$NON-NLS-1$
+
+ private String FATAL_MARKER_CLASS_ATTRIBUTE_NAME = "fatalMarkerClass"; //$NON-NLS-1$
+ private String FATAL_LABEL_CLASS_ATTRIBUTE_NAME = "fatalLabelClass"; //$NON-NLS-1$
+ private String FATAL_CLASS_ATTRIBUTE_NAME = "fatalClass"; //$NON-NLS-1$
+
+ private String INFO_MARKER_CLASS_ATTRIBUTE_NAME = "infoMarkerClass"; //$NON-NLS-1$
+ private String INFO_LABEL_CLASS_ATTRIBUTE_NAME = "infoLabelClass"; //$NON-NLS-1$
+ private String INFO_CLASS_ATTRIBUTE_NAME = "infoClass"; //$NON-NLS-1$
+
+ private String WARN_MARKER_CLASS_ATTRIBUTE_NAME = "warnMarkerClass"; //$NON-NLS-1$
+ private String WARN_LABEL_CLASS_ATTRIBUTE_NAME = "warnLabelClass"; //$NON-NLS-1$
+ private String WARN_CLASS_ATTRIBUTE_NAME = "warnClass"; //$NON-NLS-1$
+
+ private String passedLabelValue;
+ private String labelClassValue;
+ private String markerClassValue;
+ private String markerStyleValue;
+ private String errorMarkerClassValue;
+ private String errorLabelClassValue;
+ private String errorClassValue;
+ private String fatalMarkerClassValue;
+ private String fatalLabelClassValue;
+ private String fatalClassValue;
+ private String infoMarkerClassValue;
+ private String infoLabelClassValue;
+ private String infoClassValue;
+ private String warnMarkerClassValue;
+ private String warnLabelClassValue;
+ private String warnClassValue;
+ private String styleValue;
+ private String styleClassValue;
+
+ public Attributes(final Element sourceElement) {
+ passedLabelValue = sourceElement
+ .getAttribute(PASSED_LABEL_ATTRIBUTE_NAME);
+ labelClassValue = sourceElement
+ .getAttribute(LABEL_CLASS_ATTRIBUTE_NAME);
+ markerClassValue = sourceElement
+ .getAttribute(MARKER_CLASS_ATTRIBUTE_NAME);
+ markerStyleValue = sourceElement
+ .getAttribute(MARKER_STYLE_ATTRIBUTE_NAME);
+
+ errorMarkerClassValue = sourceElement
+ .getAttribute(ERROR_MARKER_CLASS_ATTRIBUTE_NAME);
+ errorLabelClassValue = sourceElement
+ .getAttribute(ERROR_LABEL_CLASS_ATTRIBUTE_NAME);
+ errorClassValue = sourceElement
+ .getAttribute(ERROR_CLASS_ATTRIBUTE_NAME);
+
+ fatalMarkerClassValue = sourceElement
+ .getAttribute(FATAL_MARKER_CLASS_ATTRIBUTE_NAME);
+ fatalLabelClassValue = sourceElement
+ .getAttribute(FATAL_LABEL_CLASS_ATTRIBUTE_NAME);
+ fatalClassValue = sourceElement
+ .getAttribute(FATAL_CLASS_ATTRIBUTE_NAME);
+
+ infoMarkerClassValue = sourceElement
+ .getAttribute(INFO_MARKER_CLASS_ATTRIBUTE_NAME);
+ infoLabelClassValue = sourceElement
+ .getAttribute(INFO_LABEL_CLASS_ATTRIBUTE_NAME);
+ infoClassValue = sourceElement
+ .getAttribute(INFO_CLASS_ATTRIBUTE_NAME);
+
+ warnMarkerClassValue = sourceElement
+ .getAttribute(WARN_MARKER_CLASS_ATTRIBUTE_NAME);
+ warnLabelClassValue = sourceElement
+ .getAttribute(WARN_LABEL_CLASS_ATTRIBUTE_NAME);
+ warnClassValue = sourceElement
+ .getAttribute(WARN_CLASS_ATTRIBUTE_NAME);
+
+ styleValue = sourceElement.getAttribute(HTML.ATTR_STYLE);
+ styleClassValue = sourceElement
+ .getAttribute(RichFaces.ATTR_STYLE_CLASS);
+
+ }
+
+ public String getErrorMarkerClassValue() {
+ return errorMarkerClassValue;
+ }
+
+ public String getErrorLabelClassValue() {
+ return errorLabelClassValue;
+ }
+
+ public String getErrorClassValue() {
+ return errorClassValue;
+ }
+
+ public String getPassedLabelValue() {
+ return passedLabelValue;
+ }
+
+ public String getLabelClassValue() {
+ return labelClassValue;
+ }
+
+ public String getMarkerClassValue() {
+ return markerClassValue;
+ }
+
+ public String getMarkerStyleValue() {
+ return markerStyleValue;
+ }
+
+ public String getFatalMarkerClassValue() {
+ return fatalMarkerClassValue;
+ }
+
+ public String getFatalLabelClassValue() {
+ return fatalLabelClassValue;
+ }
+
+ public String getFatalClassValue() {
+ return fatalClassValue;
+ }
+
+ public String getInfoMarkerClassValue() {
+ return infoMarkerClassValue;
+ }
+
+ public String getInfoLabelClassValue() {
+ return infoLabelClassValue;
+ }
+
+ public String getInfoClassValue() {
+ return infoClassValue;
+ }
+
+ public String getWarnMarkerClassValue() {
+ return warnMarkerClassValue;
+ }
+
+ public String getWarnLabelClassValue() {
+ return warnLabelClassValue;
+ }
+
+ public String getWarnClassValue() {
+ return warnClassValue;
+ }
+
+ public String getStyleValue() {
+ return styleValue;
+ }
+
+ public String getStyleClassValue() {
+ return styleClassValue;
+ }
+
+ }
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessagesTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessagesTemplate.java 2008-12-18 09:20:48 UTC (rev 12669)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesMessagesTemplate.java 2008-12-18 13:11:10 UTC (rev 12670)
@@ -13,7 +13,6 @@
import java.util.HashMap;
import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
-import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
@@ -39,50 +38,9 @@
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
- VpeCreationData creationData;
-
- passedLabelValue = ((Element) sourceNode)
- .getAttribute(PASSED_LABEL_ATTRIBUTE_NAME);
- labelClassValue = ((Element) sourceNode)
- .getAttribute(LABEL_CLASS_ATTRIBUTE_NAME);
- markerClassValue = ((Element) sourceNode)
- .getAttribute(MARKER_CLASS_ATTRIBUTE_NAME);
- markerStyleValue = ((Element) sourceNode)
- .getAttribute(MARKER_STYLE_ATTRIBUTE_NAME);
-
- errorMarkerClassValue = ((Element) sourceNode)
- .getAttribute(ERROR_MARKER_CLASS_ATTRIBUTE_NAME);
- errorLabelClassValue = ((Element) sourceNode)
- .getAttribute(ERROR_LABEL_CLASS_ATTRIBUTE_NAME);
- errorClassValue = ((Element) sourceNode)
- .getAttribute(ERROR_CLASS_ATTRIBUTE_NAME);
-
- fatalMarkerClassValue = ((Element) sourceNode)
- .getAttribute(FATAL_MARKER_CLASS_ATTRIBUTE_NAME);
- fatalLabelClassValue = ((Element) sourceNode)
- .getAttribute(FATAL_LABEL_CLASS_ATTRIBUTE_NAME);
- fatalClassValue = ((Element) sourceNode)
- .getAttribute(FATAL_CLASS_ATTRIBUTE_NAME);
-
- infoMarkerClassValue = ((Element) sourceNode)
- .getAttribute(INFO_MARKER_CLASS_ATTRIBUTE_NAME);
- infoLabelClassValue = ((Element) sourceNode)
- .getAttribute(INFO_LABEL_CLASS_ATTRIBUTE_NAME);
- infoClassValue = ((Element) sourceNode)
- .getAttribute(INFO_CLASS_ATTRIBUTE_NAME);
-
- warnMarkerClassValue = ((Element) sourceNode)
- .getAttribute(WARN_MARKER_CLASS_ATTRIBUTE_NAME);
- warnLabelClassValue = ((Element) sourceNode)
- .getAttribute(WARN_LABEL_CLASS_ATTRIBUTE_NAME);
- warnClassValue = ((Element) sourceNode)
- .getAttribute(WARN_CLASS_ATTRIBUTE_NAME);
-
- styleValue = ((Element) sourceNode)
- .getAttribute(HTML.ATTR_STYLE);
- styleClassValue = ((Element) sourceNode)
- .getAttribute(RichFaces.ATTR_STYLE_CLASS);
-
+ VpeCreationData creationData = null;
+ Element sourceElement = (Element) sourceNode;
+ final Attributes attrs = new Attributes(sourceElement);
String styleClass = CSS_RICH_MESSAGES;
String layout = ((Element) sourceNode).getAttribute(LAYOUT);
nsIDOMElement container = null;
@@ -98,11 +56,11 @@
container = visualDocument.createElement(HTML.TAG_DL);
}
- if (ComponentUtil.isNotBlank(styleValue)) {
- container.setAttribute(HTML.ATTR_STYLE, styleValue);
+ if (ComponentUtil.isNotBlank(attrs.getStyleValue())) {
+ container.setAttribute(HTML.ATTR_STYLE, attrs.getStyleValue());
}
- if (ComponentUtil.isNotBlank(styleClassValue)) {
- styleClass += Constants.WHITE_SPACE + styleClassValue;
+ if (ComponentUtil.isNotBlank(attrs.getStyleClassValue())) {
+ styleClass += Constants.WHITE_SPACE + attrs.getStyleClassValue();
}
container.setAttribute(HTML.ATTR_CLASS, styleClass);
@@ -113,10 +71,10 @@
for (int i = 0; i < markers.length; i++) {
if (facets.containsKey(markers[i])) {
container.appendChild(createVisualMessage(creationData,
- visualDocument, layout, i, (Element) facets.get(markers[i])));
+ visualDocument, layout, i, (Element) facets.get(markers[i]), attrs));
} else {
container.appendChild(createVisualMessage(creationData,
- visualDocument, layout, i, null));
+ visualDocument, layout, i, null, attrs));
}
}
return creationData;
@@ -132,7 +90,7 @@
*/
private nsIDOMElement createVisualMessage(VpeCreationData creationData,
nsIDOMDocument visualDocument, String layout, int markerNum,
- Element facet) {
+ Element facet, Attributes attrs) {
String containerClass = Constants.EMPTY;
String markerClass = CSS_RICH_MESSAGES_MARKER;
@@ -176,60 +134,60 @@
*/
switch (markerNum) {
case 0: // passed
- labelMessage = (passedLabelValue == null) ? Constants.EMPTY : passedLabelValue;
- if (ComponentUtil.isNotBlank(markerClassValue)) {
- markerClass += Constants.WHITE_SPACE + markerClassValue;
+ labelMessage = (attrs.getPassedLabelValue()== null) ? Constants.EMPTY : attrs.getPassedLabelValue();
+ if (ComponentUtil.isNotBlank(attrs.getMarkerClassValue())) {
+ markerClass += Constants.WHITE_SPACE + attrs.getMarkerClassValue();
}
- if (ComponentUtil.isNotBlank(labelClassValue)) {
- labelClass += Constants.WHITE_SPACE + labelClassValue;
+ if (ComponentUtil.isNotBlank(attrs.getLabelClassValue())) {
+ labelClass += Constants.WHITE_SPACE + attrs.getLabelClassValue();
}
break;
case 1: // error
labelMessage = ERROR_MESSAGE;
- if (ComponentUtil.isNotBlank(errorClassValue)) {
- containerClass += Constants.WHITE_SPACE + errorClassValue;
+ if (ComponentUtil.isNotBlank(attrs.getErrorClassValue())) {
+ containerClass += Constants.WHITE_SPACE + attrs.getErrorClassValue();
}
- if (ComponentUtil.isNotBlank(errorMarkerClassValue)) {
- markerClass += Constants.WHITE_SPACE + errorMarkerClassValue;
+ if (ComponentUtil.isNotBlank(attrs.getErrorMarkerClassValue())) {
+ markerClass += Constants.WHITE_SPACE + attrs.getErrorMarkerClassValue();
}
- if (ComponentUtil.isNotBlank(errorLabelClassValue)) {
- labelClass += Constants.WHITE_SPACE + errorLabelClassValue;
+ if (ComponentUtil.isNotBlank(attrs.getErrorLabelClassValue())) {
+ labelClass += Constants.WHITE_SPACE + attrs.getErrorLabelClassValue();
}
break;
case 2: // fatal
labelMessage = FATAL_MESSAGE;
- if (ComponentUtil.isNotBlank(fatalClassValue)) {
- containerClass += Constants.WHITE_SPACE + fatalClassValue;
+ if (ComponentUtil.isNotBlank(attrs.getFatalClassValue())) {
+ containerClass += Constants.WHITE_SPACE + attrs.getFatalClassValue();
}
- if (ComponentUtil.isNotBlank(fatalMarkerClassValue)) {
- markerClass += Constants.WHITE_SPACE + fatalMarkerClassValue;
+ if (ComponentUtil.isNotBlank(attrs.getFatalMarkerClassValue())) {
+ markerClass += Constants.WHITE_SPACE + attrs.getFatalMarkerClassValue();
}
- if (ComponentUtil.isNotBlank(fatalLabelClassValue)) {
- labelClass += Constants.WHITE_SPACE + fatalLabelClassValue;
+ if (ComponentUtil.isNotBlank(attrs.getFatalLabelClassValue())) {
+ labelClass += Constants.WHITE_SPACE + attrs.getFatalLabelClassValue();
}
break;
case 3: // info
labelMessage = INFO_MESSAGE;
- if (ComponentUtil.isNotBlank(infoClassValue)) {
- containerClass += Constants.WHITE_SPACE + infoClassValue;
+ if (ComponentUtil.isNotBlank(attrs.getInfoClassValue())) {
+ containerClass += Constants.WHITE_SPACE + attrs.getInfoClassValue();
}
- if (ComponentUtil.isNotBlank(infoMarkerClassValue)) {
- markerClass += Constants.WHITE_SPACE + infoMarkerClassValue;
+ if (ComponentUtil.isNotBlank(attrs.getInfoMarkerClassValue())) {
+ markerClass += Constants.WHITE_SPACE + attrs.getInfoMarkerClassValue();
}
- if (ComponentUtil.isNotBlank(infoLabelClassValue)) {
- labelClass += Constants.WHITE_SPACE + infoLabelClassValue;
+ if (ComponentUtil.isNotBlank(attrs.getInfoLabelClassValue())) {
+ labelClass += Constants.WHITE_SPACE + attrs.getInfoLabelClassValue();
}
break;
case 4: // warn
labelMessage = WARNING_MESSAGE;
- if (ComponentUtil.isNotBlank(warnClassValue)) {
- containerClass += Constants.WHITE_SPACE + warnClassValue;
+ if (ComponentUtil.isNotBlank(attrs.getWarnClassValue())) {
+ containerClass += Constants.WHITE_SPACE + attrs.getWarnClassValue();
}
- if (ComponentUtil.isNotBlank(warnMarkerClassValue)) {
- markerClass += Constants.WHITE_SPACE + warnMarkerClassValue;
+ if (ComponentUtil.isNotBlank(attrs.getWarnMarkerClassValue())) {
+ markerClass += Constants.WHITE_SPACE + attrs.getWarnMarkerClassValue();
}
- if (ComponentUtil.isNotBlank(warnLabelClassValue)) {
- labelClass += Constants.WHITE_SPACE + warnLabelClassValue;
+ if (ComponentUtil.isNotBlank(attrs.getWarnLabelClassValue())) {
+ labelClass += Constants.WHITE_SPACE + attrs.getWarnLabelClassValue();
}
break;
default:
17 years
- 1
- 0
JBoss Tools SVN: r12669 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-12-18 04:20:48 -0500 (Thu, 18 Dec 2008)
New Revision: 12669
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3361
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java 2008-12-18 01:38:57 UTC (rev 12668)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java 2008-12-18 09:20:48 UTC (rev 12669)
@@ -174,6 +174,9 @@
if (ConnectionProfileCtrl.JPA_CONNECTIN_NAME.equals(cpName)){
configuration.setAttribute(IConsoleConfigurationLaunchConstants.USE_JPA_PROJECT_PROFILE, Boolean.toString(true));
configuration.removeAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME);
+ } else if (ConnectionProfileCtrl.NO_CONNECTIN_NAME.equals(cpName)) {
+ configuration.setAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, (String)null);
+ configuration.removeAttribute(IConsoleConfigurationLaunchConstants.USE_JPA_PROJECT_PROFILE);
} else {
configuration.setAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, cpName);
configuration.removeAttribute(IConsoleConfigurationLaunchConstants.USE_JPA_PROJECT_PROFILE);
@@ -196,7 +199,7 @@
if (Boolean.parseBoolean(configuration.getAttribute(IConsoleConfigurationLaunchConstants.USE_JPA_PROJECT_PROFILE, Boolean.toString(false)))){
connectionProfileCtrl.selectValue(ConnectionProfileCtrl.JPA_CONNECTIN_NAME);
} else
- connectionProfileCtrl.selectValue(configuration.getAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, "")); //$NON-NLS-1$
+ connectionProfileCtrl.selectValue(configuration.getAttribute(IConsoleConfigurationLaunchConstants.CONNECTION_PROFILE_NAME, ConnectionProfileCtrl.NO_CONNECTIN_NAME)); //$NON-NLS-1$
}
catch (CoreException e) {
HibernateConsolePlugin.getDefault().log( e );
17 years
- 1
- 0
JBoss Tools SVN: r12668 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: icons/16 and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2008-12-17 20:38:57 -0500 (Wed, 17 Dec 2008)
New Revision: 12668
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_hql.png
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_java.png
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_sql.png
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_wait.png
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_hql.png
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_java.png
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_sql.png
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_wait.png
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_hql.png
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_java.png
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_sql.png
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_wait.png
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/CancelEndEventFigure.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ErrorEndEventFigure.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TaskFigure.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TerminateEndEventFigure.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CancelEndEvent.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ErrorEndEvent.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ForkParallelGateway.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Gateway.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JavaTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JoinParallelGateway.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelGateway.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SqlTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Task.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/TerminateEndEvent.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WaitTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndEventAcceptsOutgoingConnectionStrategy.java
Removed:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelForkGateway.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelJoinGateway.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/StateTask.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndStateAcceptsOutgoingConnectionStrategy.java
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/flow_sequence.png
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/flow_sequence.png
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/flow_sequence.png
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/JpdlPaletteFactory.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/figure/EndEventFigure.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java
Log:
addition of
- hql node
- sql node
- java node
- end-error event
- end-cancel event
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/flow_sequence.png
===================================================================
(Binary files differ)
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_hql.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_hql.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_java.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_java.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_sql.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_sql.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_wait.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/task_wait.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/flow_sequence.png
===================================================================
(Binary files differ)
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_hql.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_hql.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_java.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_java.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_sql.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_sql.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_wait.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/32/task_wait.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/flow_sequence.png
===================================================================
(Binary files differ)
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_hql.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_hql.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_java.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_java.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_sql.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_sql.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_wait.png
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/48/task_wait.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-12-18 00:42:31 UTC (rev 12667)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2008-12-18 01:38:57 UTC (rev 12668)
@@ -68,23 +68,65 @@
</node>
</element>
<element
- class="org.jboss.tools.flow.jpdl4.model.EndEvent"
- id="org.jboss.tools.flow.jpdl4.endEvent"
+ class="org.jboss.tools.flow.jpdl4.model.TerminateEndEvent"
+ id="org.jboss.tools.flow.jpdl4.terminateEndEvent"
language="org.jboss.tools.flow.jpdl4">
<node
- acceptsOutgoingConnectionStrategy="org.jboss.tools.flow.jpdl4.strategy.EndStateAcceptsOutgoingConnectionStrategy">
- <figure class="org.jboss.tools.flow.jpdl4.figure.EndEventFigure"></figure>
+ acceptsOutgoingConnectionStrategy="org.jboss.tools.flow.jpdl4.strategy.EndEventAcceptsOutgoingConnectionStrategy">
+ <figure class="org.jboss.tools.flow.jpdl4.figure.TerminateEndEventFigure"></figure>
</node>
</element>
<element
- class="org.jboss.tools.flow.jpdl4.model.StateTask"
- id="org.jboss.tools.flow.jpdl4.stateTask"
+ class="org.jboss.tools.flow.jpdl4.model.CancelEndEvent"
+ id="org.jboss.tools.flow.jpdl4.cancelEndEvent"
language="org.jboss.tools.flow.jpdl4">
+ <node
+ acceptsOutgoingConnectionStrategy="org.jboss.tools.flow.jpdl4.strategy.EndEventAcceptsOutgoingConnectionStrategy">
+ <figure class="org.jboss.tools.flow.jpdl4.figure.CancelEndEventFigure"></figure>
+ </node>
+ </element>
+ <element
+ class="org.jboss.tools.flow.jpdl4.model.ErrorEndEvent"
+ id="org.jboss.tools.flow.jpdl4.errorEndEvent"
+ language="org.jboss.tools.flow.jpdl4">
+ <node
+ acceptsOutgoingConnectionStrategy="org.jboss.tools.flow.jpdl4.strategy.EndEventAcceptsOutgoingConnectionStrategy">
+ <figure class="org.jboss.tools.flow.jpdl4.figure.ErrorEndEventFigure"></figure>
+ </node>
+ </element>
+ <element
+ class="org.jboss.tools.flow.jpdl4.model.WaitTask"
+ id="org.jboss.tools.flow.jpdl4.waitTask"
+ language="org.jboss.tools.flow.jpdl4">
<node>
- <figure class="org.jboss.tools.flow.jpdl4.figure.StateTaskFigure"></figure>
+ <figure class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure>
</node>
</element>
<element
+ class="org.jboss.tools.flow.jpdl4.model.HqlTask"
+ id="org.jboss.tools.flow.jpdl4.hqlTask"
+ language="org.jboss.tools.flow.jpdl4">
+ <node>
+ <figure class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure>
+ </node>
+ </element>
+ <element
+ class="org.jboss.tools.flow.jpdl4.model.SqlTask"
+ id="org.jboss.tools.flow.jpdl4.sqlTask"
+ language="org.jboss.tools.flow.jpdl4">
+ <node>
+ <figure class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure>
+ </node>
+ </element>
+ <element
+ class="org.jboss.tools.flow.jpdl4.model.JavaTask"
+ id="org.jboss.tools.flow.jpdl4.javaTask"
+ language="org.jboss.tools.flow.jpdl4">
+ <node>
+ <figure class="org.jboss.tools.flow.jpdl4.figure.TaskFigure"></figure>
+ </node>
+ </element>
+ <element
class="org.jboss.tools.flow.jpdl4.model.ExclusiveGateway"
id="org.jboss.tools.flow.jpdl4.exclusiveGateway"
language="org.jboss.tools.flow.jpdl4">
@@ -93,7 +135,7 @@
</node>
</element>
<element
- class="org.jboss.tools.flow.jpdl4.model.ParallelForkGateway"
+ class="org.jboss.tools.flow.jpdl4.model.ForkParallelGateway"
id="org.jboss.tools.flow.jpdl4.parallelForkGateway"
language="org.jboss.tools.flow.jpdl4">
<node>
@@ -101,7 +143,7 @@
</node>
</element>
<element
- class="org.jboss.tools.flow.jpdl4.model.ParallelJoinGateway"
+ class="org.jboss.tools.flow.jpdl4.model.JoinParallelGateway"
id="org.jboss.tools.flow.jpdl4.parallelJoinGateway"
language="org.jboss.tools.flow.jpdl4">
<node>
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 2008-12-18 00:42:31 UTC (rev 12667)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlDeserializer.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -112,10 +112,20 @@
NodeWrapper result = null;
if ("start".equals(child.getNodeName())) {
result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.startEvent");
+ } else if ("end".equals(child.getNodeName())) {
+ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.terminateEndEvent");
+ } else if ("end-error".equals(child.getNodeName())) {
+ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.errorEndEvent");
+ } else if ("end-cancel".equals(child.getNodeName())) {
+ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.cancelEndEvent");
} else if ("state".equals(child.getNodeName())) {
- result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.stateTask");
- } else if ("end".equals(child.getNodeName())) {
- result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.endEvent");
+ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.waitTask");
+ } else if ("hql".equals(child.getNodeName())) {
+ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.hqlTask");
+ } else if ("sql".equals(child.getNodeName())) {
+ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.sqlTask");
+ } else if ("java".equals(child.getNodeName())) {
+ result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.javaTask");
} else if ("exclusive".equals(child.getNodeName())) {
result = (NodeWrapper)ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.exclusiveGateway");
} else if ("join".equals(child.getNodeName())) {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2008-12-18 00:42:31 UTC (rev 12667)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlPaletteFactory.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -66,7 +66,7 @@
protected List<PaletteEntry> createEventEntries() {
List<PaletteEntry> entries = new ArrayList<PaletteEntry>();
CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry(
- "Start",
+ "Start Event",
"Create a new Start Event",
"org.jboss.tools.flow.jpdl4.startEvent",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.startEvent"),
@@ -75,35 +75,80 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "End",
- "Create a new End Event",
- "org.jboss.tools.flow.jpdl4.endEvent",
- ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.endEvent"),
+ "Terminate End Event",
+ "Create a new terminating end event",
+ "org.jboss.tools.flow.jpdl4.terminateEndEvent",
+ ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.terminateEndEvent"),
ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/end_event_terminate.png")),
ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/end_event_terminate.png"))
);
entries.add(combined);
+ combined = new CombinedTemplateCreationEntry(
+ "Cancel End Event",
+ "Create a new cancel end event",
+ "org.jboss.tools.flow.jpdl4.cancelEndEvent",
+ ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.cancelEndEvent"),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/end_event_cancel.png")),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/end_event_cancel.png"))
+ );
+ entries.add(combined);
+ combined = new CombinedTemplateCreationEntry(
+ "Error End Event",
+ "Create a new error end event",
+ "org.jboss.tools.flow.jpdl4.errorEndEvent",
+ ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.errorEndEvent"),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/end_event_error.png")),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/end_event_error.png"))
+ );
+ entries.add(combined);
return entries;
}
protected List<PaletteEntry> createTaskEntries() {
List<PaletteEntry> entries = new ArrayList<PaletteEntry>();
CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry(
- "Wait State",
+ "Wait State Task",
"Create a new Wait State Task",
- "org.jboss.tools.flow.jpdl4.stateTask",
- ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.stateTask"),
- ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_empty.png")),
- ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_empty.png"))
+ "org.jboss.tools.flow.jpdl4.waitTask",
+ ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.waitTask"),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_wait.png")),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_wait.png"))
);
entries.add(combined);
+ combined = new CombinedTemplateCreationEntry(
+ "HQL Task",
+ "Create a new HQL Task",
+ "org.jboss.tools.flow.jpdl4.hqlTask",
+ ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.hqlTask"),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_hql.png")),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_hql.png"))
+ );
+ entries.add(combined);
+ combined = new CombinedTemplateCreationEntry(
+ "SQL Task",
+ "Create a new SQL Task",
+ "org.jboss.tools.flow.jpdl4.sqlTask",
+ ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.sqlTask"),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_sql.png")),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_sql.png"))
+ );
+ entries.add(combined);
+ combined = new CombinedTemplateCreationEntry(
+ "Java Task",
+ "Create a new Java Task",
+ "org.jboss.tools.flow.jpdl4.javaTask",
+ ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.javaTask"),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/task_java.png")),
+ ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/32/task_java.png"))
+ );
+ entries.add(combined);
return entries;
}
protected List<PaletteEntry> createGatewayEntries() {
List<PaletteEntry> entries = new ArrayList<PaletteEntry>();
CombinedTemplateCreationEntry combined = new CombinedTemplateCreationEntry(
- "Exclusive",
+ "Exclusive Gateway",
"Create a new Exclusive Gateway",
"org.jboss.tools.flow.jpdl4.exclusiveGateway",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.exclusiveGateway"),
@@ -112,7 +157,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "Parallel Fork",
+ "Fork Parallel Gateway",
"Create a new Parallel Fork Gateway",
"org.jboss.tools.flow.jpdl4.parallelForkGateway",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.parallelForkGateway"),
@@ -121,7 +166,7 @@
);
entries.add(combined);
combined = new CombinedTemplateCreationEntry(
- "Parallel Join",
+ "Join Parallel Gateway",
"Create a new Parallel Join Gateway",
"org.jboss.tools.flow.jpdl4.parallelJoinGateway",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.parallelJoinGateway"),
@@ -135,7 +180,7 @@
protected List<PaletteEntry> createFlowEntries() {
List<PaletteEntry> entries = new ArrayList<PaletteEntry>();
ToolEntry tool = new ConnectionCreationToolEntry(
- "Sequence",
+ "Sequence Flow",
"Creating a new Sequence Flow",
ElementRegistry.getCreationFactory("org.jboss.tools.flow.jpdl4.sequenceFlow"),
ImageDescriptor.createFromURL(Activator.getDefault().getBundle().getEntry("icons/16/flow_sequence.png")),
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 2008-12-18 00:42:31 UTC (rev 12667)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -13,15 +13,20 @@
import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
import org.jboss.tools.flow.common.wrapper.Wrapper;
-import org.jboss.tools.flow.jpdl4.model.EndEvent;
+import org.jboss.tools.flow.jpdl4.model.CancelEndEvent;
+import org.jboss.tools.flow.jpdl4.model.ErrorEndEvent;
import org.jboss.tools.flow.jpdl4.model.ExclusiveGateway;
-import org.jboss.tools.flow.jpdl4.model.ParallelForkGateway;
-import org.jboss.tools.flow.jpdl4.model.ParallelJoinGateway;
+import org.jboss.tools.flow.jpdl4.model.ForkParallelGateway;
+import org.jboss.tools.flow.jpdl4.model.HqlTask;
+import org.jboss.tools.flow.jpdl4.model.JavaTask;
+import org.jboss.tools.flow.jpdl4.model.JoinParallelGateway;
import org.jboss.tools.flow.jpdl4.model.Process;
import org.jboss.tools.flow.jpdl4.model.SequenceFlow;
+import org.jboss.tools.flow.jpdl4.model.SqlTask;
import org.jboss.tools.flow.jpdl4.model.StartEvent;
-import org.jboss.tools.flow.jpdl4.model.StateTask;
import org.jboss.tools.flow.jpdl4.model.SuperState;
+import org.jboss.tools.flow.jpdl4.model.TerminateEndEvent;
+import org.jboss.tools.flow.jpdl4.model.WaitTask;
public class JpdlSerializer {
@@ -63,25 +68,47 @@
buffer.append("to=\"" + value + "\"");
}
appendConnectionGraphics(buffer, (ConnectionWrapper)wrapper);
- } else if (element instanceof EndEvent) {
- EndEvent endState = (EndEvent)element;
+ } else if (element instanceof TerminateEndEvent) {
+ TerminateEndEvent terminateEndEvent = (TerminateEndEvent)element;
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("<end");
- if (!isEmpty(endState.getName())) {
+ if (!isEmpty(terminateEndEvent.getName())) {
buffer.append(" ");
- String value = endState.getName();
+ String value = terminateEndEvent.getName();
buffer.append("name=\"" + value + "\"");
}
appendNodeGraphics(buffer, (NodeWrapper)wrapper);
+ } else if (element instanceof ErrorEndEvent) {
+ ErrorEndEvent errorEndEvent = (ErrorEndEvent)element;
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("<end-error");
+ if (!isEmpty(errorEndEvent.getName())) {
+ buffer.append(" ");
+ String value = errorEndEvent.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
+ } else if (element instanceof CancelEndEvent) {
+ CancelEndEvent cancelEndEvent = (CancelEndEvent)element;
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("<end-cancel");
+ if (!isEmpty(cancelEndEvent.getName())) {
+ buffer.append(" ");
+ String value = cancelEndEvent.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
} else if (element instanceof StartEvent) {
- StartEvent startState = (StartEvent)element;
+ StartEvent startEvent = (StartEvent)element;
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("<start");
- if (!isEmpty(startState.getName())) {
+ if (!isEmpty(startEvent.getName())) {
buffer.append(" ");
- String value = startState.getName();
+ String value = startEvent.getName();
buffer.append("name=\"" + value + "\"");
}
appendNodeGraphics(buffer, (NodeWrapper)wrapper);
@@ -95,17 +122,50 @@
String value = superState.getName();
buffer.append("name=\"" + value + "\"");
}
- } else if (element instanceof StateTask) {
- StateTask state = (StateTask)element;
+ } else if (element instanceof WaitTask) {
+ WaitTask waitTask = (WaitTask)element;
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("<state");
- if (!isEmpty(state.getName())) {
+ if (!isEmpty(waitTask.getName())) {
buffer.append(" ");
- String value = state.getName();
+ String value = waitTask.getName();
buffer.append("name=\"" + value + "\"");
}
appendNodeGraphics(buffer, (NodeWrapper)wrapper);
+ } else if (element instanceof HqlTask) {
+ HqlTask hqlTask = (HqlTask)element;
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("<hql");
+ if (!isEmpty(hqlTask.getName())) {
+ buffer.append(" ");
+ String value = hqlTask.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
+ } else if (element instanceof SqlTask) {
+ SqlTask sqlTask = (SqlTask)element;
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("<sql");
+ if (!isEmpty(sqlTask.getName())) {
+ buffer.append(" ");
+ String value = sqlTask.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
+ } else if (element instanceof JavaTask) {
+ JavaTask javaTask = (JavaTask)element;
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("<java");
+ if (!isEmpty(javaTask.getName())) {
+ buffer.append(" ");
+ String value = javaTask.getName();
+ buffer.append("name=\"" + value + "\"");
+ }
+ appendNodeGraphics(buffer, (NodeWrapper)wrapper);
} else if (element instanceof ExclusiveGateway) {
ExclusiveGateway exclusiveGateway = (ExclusiveGateway)element;
buffer.append("\n");
@@ -117,8 +177,8 @@
buffer.append("name=\"" + value + "\"");
}
appendNodeGraphics(buffer, (NodeWrapper)wrapper);
- } else if (element instanceof ParallelForkGateway) {
- ParallelForkGateway parallelForkGateway = (ParallelForkGateway)element;
+ } else if (element instanceof ForkParallelGateway) {
+ ForkParallelGateway parallelForkGateway = (ForkParallelGateway)element;
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("<fork");
@@ -128,8 +188,8 @@
buffer.append("name=\"" + value + "\"");
}
appendNodeGraphics(buffer, (NodeWrapper)wrapper);
- } else if (element instanceof ParallelJoinGateway) {
- ParallelJoinGateway parallelJoinGateway = (ParallelJoinGateway)element;
+ } else if (element instanceof JoinParallelGateway) {
+ JoinParallelGateway parallelJoinGateway = (JoinParallelGateway)element;
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("<join");
@@ -175,10 +235,18 @@
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("</flow>");
- } else if (element instanceof EndEvent) {
+ } else if (element instanceof TerminateEndEvent) {
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("</end>");
+ } else if (element instanceof ErrorEndEvent) {
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("</end-error>");
+ } else if (element instanceof CancelEndEvent) {
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("</end-cancel>");
} else if (element instanceof StartEvent) {
buffer.append("\n");
appendPadding(buffer, level);
@@ -187,19 +255,31 @@
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("</super-state>");
- } else if (element instanceof StateTask) {
+ } else if (element instanceof WaitTask) {
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("</state>");
+ } else if (element instanceof HqlTask) {
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("</hql>");
+ } else if (element instanceof SqlTask) {
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("</sql>");
+ } else if (element instanceof JavaTask) {
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ buffer.append("</java>");
} else if (element instanceof ExclusiveGateway) {
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("</exclusive>");
- } else if (element instanceof ParallelForkGateway) {
+ } else if (element instanceof ForkParallelGateway) {
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("</fork>");
- } else if (element instanceof ParallelJoinGateway) {
+ } else if (element instanceof JoinParallelGateway) {
buffer.append("\n");
appendPadding(buffer, level);
buffer.append("</join>");
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/CancelEndEventFigure.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/CancelEndEventFigure.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/CancelEndEventFigure.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,17 @@
+package org.jboss.tools.flow.jpdl4.figure;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.flow.jpdl4.Activator;
+
+public class CancelEndEventFigure extends EndEventFigure {
+
+ private static final Image icon = ImageDescriptor.createFromURL(
+ Activator.getDefault().getBundle().getEntry(
+ "icons/48/end_event_cancel.png")).createImage();
+
+ protected void customizeFigure() {
+ setIcon(icon);
+ }
+
+}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java 2008-12-18 00:42:31 UTC (rev 12667)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/EndEventFigure.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -1,17 +1,6 @@
package org.jboss.tools.flow.jpdl4.figure;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.jboss.tools.flow.jpdl4.Activator;
-public class EndEventFigure extends EventFigure { //EventFigure {
+public abstract class EndEventFigure extends EventFigure { //EventFigure {
- private static final Image icon = ImageDescriptor.createFromURL(
- Activator.getDefault().getBundle().getEntry(
- "icons/48/end_event_terminate.png")).createImage();
-
- protected void customizeFigure() {
- setIcon(icon);
- }
-
}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ErrorEndEventFigure.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ErrorEndEventFigure.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/ErrorEndEventFigure.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,17 @@
+package org.jboss.tools.flow.jpdl4.figure;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.flow.jpdl4.Activator;
+
+public class ErrorEndEventFigure extends EndEventFigure {
+
+ private static final Image icon = ImageDescriptor.createFromURL(
+ Activator.getDefault().getBundle().getEntry(
+ "icons/48/end_event_error.png")).createImage();
+
+ protected void customizeFigure() {
+ setIcon(icon);
+ }
+
+}
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java 2008-12-18 00:42:31 UTC (rev 12667)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -1,29 +0,0 @@
-package org.jboss.tools.flow.jpdl4.figure;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.swt.graphics.Color;
-import org.jboss.tools.flow.common.figure.RoundedRectangleElementFigure;
-
-public class StateTaskFigure extends RoundedRectangleElementFigure {
-
- private static final Color veryLightBlue = new Color(null, 246, 247, 255);
- private static final Color lightBlue = new Color(null, 3, 104, 154);
-
- protected void paintChildren(Graphics graphics) {
- Color foregroundColor = graphics.getForegroundColor();
- Color backgroundColor = graphics.getBackgroundColor();
- graphics.setBackgroundColor(veryLightBlue);
- graphics.setForegroundColor(lightBlue);
- super.paintChildren(graphics);
- graphics.setBackgroundColor(backgroundColor);
- graphics.setForegroundColor(foregroundColor);
- }
-
- protected void customizeFigure() {
- super.customizeFigure();
- getLabel().setForegroundColor(ColorConstants.darkGray);
- rectangle.setLineWidth(2);
- }
-
-}
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TaskFigure.java (from rev 12631, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/StateTaskFigure.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TaskFigure.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TaskFigure.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,29 @@
+package org.jboss.tools.flow.jpdl4.figure;
+
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.swt.graphics.Color;
+import org.jboss.tools.flow.common.figure.RoundedRectangleElementFigure;
+
+public class TaskFigure extends RoundedRectangleElementFigure {
+
+ private static final Color veryLightBlue = new Color(null, 246, 247, 255);
+ private static final Color lightBlue = new Color(null, 3, 104, 154);
+
+ protected void paintChildren(Graphics graphics) {
+ Color foregroundColor = graphics.getForegroundColor();
+ Color backgroundColor = graphics.getBackgroundColor();
+ graphics.setBackgroundColor(veryLightBlue);
+ graphics.setForegroundColor(lightBlue);
+ super.paintChildren(graphics);
+ graphics.setBackgroundColor(backgroundColor);
+ graphics.setForegroundColor(foregroundColor);
+ }
+
+ protected void customizeFigure() {
+ super.customizeFigure();
+ getLabel().setForegroundColor(ColorConstants.darkGray);
+ rectangle.setLineWidth(2);
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TaskFigure.java
___________________________________________________________________
Name: svn:mergeinfo
+
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TerminateEndEventFigure.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TerminateEndEventFigure.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/figure/TerminateEndEventFigure.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,17 @@
+package org.jboss.tools.flow.jpdl4.figure;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.flow.jpdl4.Activator;
+
+public class TerminateEndEventFigure extends EndEventFigure {
+
+ private static final Image icon = ImageDescriptor.createFromURL(
+ Activator.getDefault().getBundle().getEntry(
+ "icons/48/end_event_terminate.png")).createImage();
+
+ protected void customizeFigure() {
+ setIcon(icon);
+ }
+
+}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CancelEndEvent.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CancelEndEvent.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/CancelEndEvent.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class CancelEndEvent extends EndEvent {
+
+}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ErrorEndEvent.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ErrorEndEvent.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ErrorEndEvent.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class ErrorEndEvent extends EndEvent {
+
+}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java 2008-12-18 00:42:31 UTC (rev 12667)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -1,7 +1,6 @@
package org.jboss.tools.flow.jpdl4.model;
-import org.jboss.tools.flow.common.model.DefaultNode;
-public class ExclusiveGateway extends DefaultNode {
+public class ExclusiveGateway extends Gateway {
}
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ForkParallelGateway.java (from rev 12584, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelForkGateway.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ForkParallelGateway.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ForkParallelGateway.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class ForkParallelGateway extends ParallelGateway {
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ForkParallelGateway.java
___________________________________________________________________
Name: svn:mergeinfo
+
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Gateway.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Gateway.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Gateway.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,7 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+import org.jboss.tools.flow.common.model.DefaultNode;
+
+public class Gateway extends DefaultNode {
+
+}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/HqlTask.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class HqlTask extends Task {
+
+}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JavaTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JavaTask.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JavaTask.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class JavaTask extends Task {
+
+}
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JoinParallelGateway.java (from rev 12584, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelJoinGateway.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JoinParallelGateway.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JoinParallelGateway.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class JoinParallelGateway extends Gateway {
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/JoinParallelGateway.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelForkGateway.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelForkGateway.java 2008-12-18 00:42:31 UTC (rev 12667)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelForkGateway.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -1,7 +0,0 @@
-package org.jboss.tools.flow.jpdl4.model;
-
-import org.jboss.tools.flow.common.model.DefaultNode;
-
-public class ParallelForkGateway extends DefaultNode {
-
-}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelGateway.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelGateway.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelGateway.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class ParallelGateway extends Gateway {
+
+}
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelJoinGateway.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelJoinGateway.java 2008-12-18 00:42:31 UTC (rev 12667)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ParallelJoinGateway.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -1,7 +0,0 @@
-package org.jboss.tools.flow.jpdl4.model;
-
-import org.jboss.tools.flow.common.model.DefaultNode;
-
-public class ParallelJoinGateway extends DefaultNode {
-
-}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SqlTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SqlTask.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SqlTask.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class SqlTask extends Task {
+
+}
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/StateTask.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/StateTask.java 2008-12-18 00:42:31 UTC (rev 12667)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/StateTask.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -1,7 +0,0 @@
-package org.jboss.tools.flow.jpdl4.model;
-
-import org.jboss.tools.flow.common.model.DefaultNode;
-
-public class StateTask extends DefaultNode {
-
-}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Task.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Task.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Task.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,7 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+import org.jboss.tools.flow.common.model.DefaultNode;
+
+public class Task extends DefaultNode {
+
+}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/TerminateEndEvent.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/TerminateEndEvent.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/TerminateEndEvent.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class TerminateEndEvent extends EndEvent {
+
+}
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WaitTask.java (from rev 12088, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/StateTask.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WaitTask.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/WaitTask.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,6 @@
+package org.jboss.tools.flow.jpdl4.model;
+
+
+public class WaitTask extends Task {
+
+}
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndEventAcceptsOutgoingConnectionStrategy.java (from rev 12088, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndStateAcceptsOutgoingConnectionStrategy.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndEventAcceptsOutgoingConnectionStrategy.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndEventAcceptsOutgoingConnectionStrategy.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -0,0 +1,16 @@
+package org.jboss.tools.flow.jpdl4.strategy;
+
+import org.jboss.tools.flow.common.model.Connection;
+import org.jboss.tools.flow.common.model.Node;
+import org.jboss.tools.flow.common.strategy.AcceptsOutgoingConnectionStrategy;
+
+public class EndEventAcceptsOutgoingConnectionStrategy implements AcceptsOutgoingConnectionStrategy {
+
+ public boolean acceptsOutgoingConnection(Connection connection, Node source) {
+ return false;
+ }
+
+ public void setNode(Node node) {
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndEventAcceptsOutgoingConnectionStrategy.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndStateAcceptsOutgoingConnectionStrategy.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndStateAcceptsOutgoingConnectionStrategy.java 2008-12-18 00:42:31 UTC (rev 12667)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/strategy/EndStateAcceptsOutgoingConnectionStrategy.java 2008-12-18 01:38:57 UTC (rev 12668)
@@ -1,16 +0,0 @@
-package org.jboss.tools.flow.jpdl4.strategy;
-
-import org.jboss.tools.flow.common.model.Connection;
-import org.jboss.tools.flow.common.model.Node;
-import org.jboss.tools.flow.common.strategy.AcceptsOutgoingConnectionStrategy;
-
-public class EndStateAcceptsOutgoingConnectionStrategy implements AcceptsOutgoingConnectionStrategy {
-
- public boolean acceptsOutgoingConnection(Connection connection, Node source) {
- return false;
- }
-
- public void setNode(Node node) {
- }
-
-}
17 years
- 1
- 0
JBoss Tools SVN: r12667 - in trunk/documentation/whatsnew: as and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-12-17 19:42:31 -0500 (Wed, 17 Dec 2008)
New Revision: 12667
Added:
trunk/documentation/whatsnew/as/as-news-2.0.0.CR1.html
trunk/documentation/whatsnew/esb/esb-news-1.1.0.CR1.html
trunk/documentation/whatsnew/examples/examples-news-1.0.0.CR1.html
trunk/documentation/whatsnew/hibernate/hibernate-news-3.2.4.CR1.html
trunk/documentation/whatsnew/jmx/
trunk/documentation/whatsnew/jmx/jmx-news-0.5.0.CR1.html
trunk/documentation/whatsnew/portlet/portlet-news-1.0.0.CR1.html
trunk/documentation/whatsnew/seam/seam-news-2.0.0.CR1.html
trunk/documentation/whatsnew/smooks/smooks-news-1.0.0.CR1.html
trunk/documentation/whatsnew/vpe/vpe-news-3.0.0.CR1.html
Modified:
trunk/documentation/whatsnew/index.html
Log:
first cut of n&n
Added: trunk/documentation/whatsnew/as/as-news-2.0.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/as/as-news-2.0.0.CR1.html (rev 0)
+++ trunk/documentation/whatsnew/as/as-news-2.0.0.CR1.html 2008-12-18 00:42:31 UTC (rev 12667)
@@ -0,0 +1,140 @@
+<html>
+
+<head>
+<link rel="stylesheet" href="../whatsnew.css">
+<title>JBoss AS Tools 2.0.0.CR1 News</title>
+</head>
+
+<body>
+
+<h1>JBoss AS Tools 2.0.0.CR1 - New and Noteworthy</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../portlet/portlet-news-1.0.0.CR1.html">Portlet Tools News ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr>
+ <h3>Servers</h3>
+ <hr>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>Server Log View</b></td>
+ <td valign="top">
+ <p>The Event Log was formerly embedded inside the Servers view; now it has its own view providing easier access and sorting.</p>
+
+ <p><img src="../images/as_serverlog.png"/></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>New Servers View</b></td>
+ <td valign="top">
+ <p>Last release introduced the new Servers View as an additional beta view.</p>
+ <p>In this release we made it the default view.</p>
+<p>The new view is built on Common Navigator Framework allowing extensions
+and is using label decorators instead of extra columns to make the UI
+more compact without loosing the vital information.</p>
+
+ <p>We have suggested to WTP that they incorporate a view based
+on this. You can provide feedback on this
+at <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=247934">bugs.eclipse.org</a>
+and the related bugs.</p>
+
+ <p><img src="../images/serveres_beta_view.png"/></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>Direct edit from Fileset's</b></td>
+ <td valign="top">
+ <p>Double clicking on a file from Servers fileset now opens up the editor automatically.</p>
+
+ <p><img src="../images/fileset_dbl_click.png"/></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>Server created with default JDK</b></td>
+ <td valign="top">
+ <p>Previous versions created servers/runtimes with a specific JDK, now they are created to use
+the default JDK. If you want to use a specific JDK you can go an update it in the server launch config.</p>
+
+ <p><img src="../images/as_server_default_jdk.png"/></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>Deploy in Workspace</b></td>
+ <td valign="top">
+ <p>All JBoss 4.x servers now default to deploying into Eclipse workspace preventing pollution off the default server deploy directory.</p>
+<p>Existing servers will still deploy where they were configured to, but you can double click a server and adjust which mode of deployment you want: In Workspace, Default Server deploy or any custom directory you would wish.</p>
+
+<p>The locations are added to the server via JMX thus it requires JMX to be enabled and if secured that you have specified username/password.</p>
+
+ <p><img src="../images/as_server_deploy.png"/></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>JMX Integration</b></td>
+ <td valign="top">
+ <p>The new JMX view/perspective is integrated into the Server view. You can navigate directly to it via Show In > JMX View.</p>
+
+ <p><img src="../images/as_show_in_jmx.png"/></p>
+
+<p>When the server is started you can browse the preconfigured JMX connection.</p>
+
+ <p><img src="../images/as_server_jmx.png"/></p>
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/esb/esb-news-1.1.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/esb/esb-news-1.1.0.CR1.html (rev 0)
+++ trunk/documentation/whatsnew/esb/esb-news-1.1.0.CR1.html 2008-12-18 00:42:31 UTC (rev 12667)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>ESB tools 1.1.0.CR1 What's New</title>
+</head>
+<body>
+<h1>ESB tools 1.1.0.CR1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../smooks/smooks-news-1.0.0.CR1.html">Smooks Tools News ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>General</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Reference guide</b></td>
+ <td valign="top">
+ <p>There is now a reference guide for the ESB functionallity.</p>
+ <p><img src="../images/esb_docs.png"/></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Projects</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>"Finger touch" now for ESB projects</b></td>
+ <td valign="top">
+ <p>The "Finger" touches descriptors dependent on project (i.e. web.xml for WAR, application.xml for EAR) and now it also touches jboss-esb.xml for ESB projects. This allows for a quick restart of just the project without having to restart server.</p>
+ <p><img src="../images/esb_finger.png"/></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>ESB classpath container</b></td>
+ <td valign="top">
+ <p>The classpath container for ESB projects is now configurable allowing you to more easily change ESB runtime for a project.
+Furthermore the classpath container now also allow modification of source and JavaDoc location.</p>
+ <p><img src="../images/esb_classpathcontainer.png"/></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>"Run/Debug" a ESB project</b></td>
+ <td valign="top">
+ <p>The Run On and Debug On actions now work on ESB projects causing a (re)deploy for a user designated server.</p>
+ <p><img src="../images/esb_runonserver.png"/></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>"Missing runtime" warning</b></td>
+ <td valign="top">
+ <p>If server runtime does not contain ESB runtime jars the project wizard now shows a warning to inform the user that
+the required runtime functionallity.</p>
+ <p><img src="../images/esb_missingruntime.png"/></p>
+ </td>
+ </tr>
+
+
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/examples/examples-news-1.0.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/examples/examples-news-1.0.0.CR1.html (rev 0)
+++ trunk/documentation/whatsnew/examples/examples-news-1.0.0.CR1.html 2008-12-18 00:42:31 UTC (rev 12667)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>Examples 1.0.0.CR1 What's New</title>
+</head>
+<body>
+<h1>Examples 1.0.0.CR1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../core/core-news-3.0.0.CR1.html">Core/General ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>General</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Quick fixes</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>Project Examples Wizard now provide an option for running Quick fixes on an imported project to
+easily fix possible issues like i.e. missing servers, seam runtimes etc.</p>
+
+ <p><img src="../images/example_quickfix.png"/></p>
+
+ <p>For this to work the smoothest we added quick fixes for various Seam problem markers.</p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Help > Project Examples</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>Project Examples is now also available directly from the Help menu.</p>
+
+ <p><img src="../images/example_helpmenu.png"/></p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Quick filter in Wizard</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>Project Examples Wizard now provide a filter field to more easily locate the project examples you want.</p>
+
+ <p><img src="../images/example_filter.png"/></p>
+
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/hibernate/hibernate-news-3.2.4.CR1.html
===================================================================
--- trunk/documentation/whatsnew/hibernate/hibernate-news-3.2.4.CR1.html (rev 0)
+++ trunk/documentation/whatsnew/hibernate/hibernate-news-3.2.4.CR1.html 2008-12-18 00:42:31 UTC (rev 12667)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>Hibernate tools 3.2.4.CR1 What's New</title>
+</head>
+<body>
+<h1>Hibernate tools 3.2.4.CR1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../as/as-news-2.0.0.CR1.html">JBoss AS Tools News ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>JPA Projects</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Console configuration created for JPA project</b></td>
+ <td valign="top">
+ <p>When a JPA/Dali project is created we now automatically setup a Hibernate Console configuration for the project allowing full
+usage of Hibernate Tools features without additional setup.</p>
+
+ <p><img src="../images/jpa_consoleconfig.png"/></p>
+
+
+ </td>
+ </tr>
+
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Reverse engineering</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>One-to-One</b></td>
+ <td valign="top">
+ <p>Reverse engineering now detects one-to-one associations via primary key and both hbm.xml and annotation generation generates the proper code for it.</p>
+
+<p>The detection is enabled by default (except for Seam 1.2 and Seam 2.0) reverse engineering. For Hibernate Tools generation there is a checkbox to disable if not wanted.</p>
+
+ <p><img src="../images/onetooneconfig.png"/></p>
+
+
+ </td>
+ </tr>
+
+
+</table>
+
+</body>
+
+</html>
+
+
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2008-12-18 00:08:02 UTC (rev 12666)
+++ trunk/documentation/whatsnew/index.html 2008-12-18 00:42:31 UTC (rev 12667)
@@ -21,6 +21,22 @@
</tr>
<tr>
<td valign="top" align="left">
+ <p align="right"><b>3.0.0.CR1</b>
+ <td valign="top">
+ <p><a href="jmx/jmx-news-0.5.0.CR1.html">JMX Tools</a></p>
+ <p><a href="esb/esb-news-1.1.0.CR1.html">JBoss ESB Tools</a></p>
+ <p><a href="hibernate/hibernate-news-3.2.4.CR1.html">Hibernate Tools</a></p>
+ <p><a href="as/as-news-2.0.0.CR1.html">JBoss AS Tools</a></p>
+ <p><a href="vpe/vpe-news-3.0.0.CR1.html">Visual Page Editor</a></p>
+ <p><a href="portlet/portlet-news-1.0.0.CR1.html">Portal Tools</a></p>
+ <p><a href="examples/examples-news-1.0.0.CR1.html">Examples</a></p>
+ <p><a href="seam/seam-news-2.0.0.CR1.html">Seam Tools</a></p>
+ <p><a href="smooks/smooks-news-1.0.0.CR1.html">Smooks Tools</a></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
<p align="right"><b>3.0.0.Beta1</b>
<td valign="top">
<p><a href="core/core-news-3.0.0.Beta1.html">Core/General</a></p>
Added: trunk/documentation/whatsnew/jmx/jmx-news-0.5.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/jmx/jmx-news-0.5.0.CR1.html (rev 0)
+++ trunk/documentation/whatsnew/jmx/jmx-news-0.5.0.CR1.html 2008-12-18 00:42:31 UTC (rev 12667)
@@ -0,0 +1,40 @@
+<html>
+
+<head>
+<link rel="stylesheet" href="../whatsnew.css">
+<title>JMX Tools 0.5.beta1 News</title>
+</head>
+
+<body>
+
+<h1>JMX Tools 0.5.beta1 - New and Noteworthy</h1>
+
+<html>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr>
+ <h3>General</h3>
+ <hr>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>Eclipse JMX moves to JBoss Tools</b></td>
+ <td valign="top">
+ <p>Jeff Mesnil contributed his Eclipse-JMX plugin to JBoss Tools, now called JMX Tools.</p>
+ <p>JMX Tools allows you to setup multiple JMX connections and
+ provides view for exploring the JMX tree and execute operations
+ directly from Eclipse. The JMX Tools replaces the JMX node we previously had in the JBoss Server View.</p>
+
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/portlet/portlet-news-1.0.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/portlet/portlet-news-1.0.0.CR1.html (rev 0)
+++ trunk/documentation/whatsnew/portlet/portlet-news-1.0.0.CR1.html 2008-12-18 00:42:31 UTC (rev 12667)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>JBoss Tools Portlet</title>
+</head>
+<body>
+<h1>JBoss Tools Portlet 3.0.0.CR1 - New and Noteworthy</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../vpe/vpe-news-3.0.0.CR1.html">Visual Page Editor News ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>JBoss Tools Portlet</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>Portlet runtime validation</b></p>
+ </td>
+ <td valign="top">
+ <p>
+ Portlet wizards uses a new mechanism for setting up libraries and verifying wether the runtime
+supports the functionallity.</p>
+
+ <p>If a runtime does not support Portal the portal functionallity will not be available. If
+you want it to show no matter what the runtime support you can go to XYZ.</p>
+ </td>
+
+<p><img src="../images/portlet_libraries.png"/></p>
+<p><img src="../images/portlet_runtimevalidation.png"/></p>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+
+
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/seam/seam-news-2.0.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/seam/seam-news-2.0.0.CR1.html (rev 0)
+++ trunk/documentation/whatsnew/seam/seam-news-2.0.0.CR1.html 2008-12-18 00:42:31 UTC (rev 12667)
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>Seam tools 2.0.0.CR1 What's New</title>
+</head>
+<body>
+<h1>Seam tools 2.0.0.CR1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../hibernate/hibernate-news-3.2.4.CR1.html">Hibernate News ></a></p>
+
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Projects</h3>
+ <hr/>
+ </td>
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Up- or Down-grade of Seam versions</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>It is now possible to use the facet preferences to uprade or downgrade your projects Seam version.</p>
+ <p>The update is a "best-attempt" that will adjust the libraries, Seam facet and runtime version, but configuration files that refer to
+the old version will have to be manually updated.</p>
+
+ <p><img src="../images/selective_seam_generate_entities.png"/></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Seam 2.1 support</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>There is now a Seam 2.1 runtime option and the components.xml editor supports the new XSD for Seam 2.1</p>
+
+ <p><img src="../images/seam_21support.png"/></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Hot Deploy of WAR in EAR</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>The WAR generated for EAR's is now configured to utilize Seam hot-deployment (WEB-INF/dev) similar to standalone WAR projects.</p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>action/model vs hot/main</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>To align with seam-gen in Seam 2.1 naming of source path's,
+action is now hot and model is now main. The reason being that hot and
+main better described what the folders are used for.</p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Open Web Browser</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>The Open Web Browser action is now directly available in the Seam perspective.</p>
+
+ <p><img src="../images/seam_openbrowser.png"/></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Validation</h3>
+ <hr/>
+ </td>
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Severity preference for EL Syntax check</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>There is now a preference for setting severity of EL Syntax check to Error, Warning or Ignore.</p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Warning for wrong Seam version</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>The valdiator now checks if the runtime matches with the
+ version referred to in components.xml, i.e. runtime is Seam 2.0,
+ but components.xml refers to Seam 2.1</p>
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Wizards warns against existing file</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>The various Seam action,form,etc. wizard now warns if the wizard will generate a class or page that already
+exist.</p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Project Wizards escape spaces</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>Use of project names with spaces now work since we now escapes the related package names.</p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>entity-query support</b>
+ </td>
+ <td width="70%" valign="top">
+ <p><framework:entity-query name="postList" ...> is now recognized as a EntityQuery component making code completion aware of it methods/attributes.</p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Pages Editor</h3>
+ <hr/>
+ </td>
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Delete on nodes</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>Nodes in graphical pages.xml can now be directly deleted by using the Delete key.</p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>View ID browser</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>When renaming a page node you can now browse for existing pages.</p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>OpenOn</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>EL and Page Id's can now be navigate to directly via OpenOn's from source page.</p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right">
+ <a name="itemnam2e" id="itemname2"></a><b>Code completion</b>
+ </td>
+ <td width="70%" valign="top">
+ <p>EL references is now code completed in the source tab of pages.xml. The graphical node now also provides code completion for page id and EL expressions.
+.</p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
+
+
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/smooks/smooks-news-1.0.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/smooks/smooks-news-1.0.0.CR1.html (rev 0)
+++ trunk/documentation/whatsnew/smooks/smooks-news-1.0.0.CR1.html 2008-12-18 00:42:31 UTC (rev 12667)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>Smooks tools 3.0.0.CR1 What's New</title>
+</head>
+<body>
+<h1>Smooks tools 3.0.0.CR1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../examples/examples-news-1.0.0.CR1.html">Examples ></a></p>
+
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Smooks</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Source</b></td>
+ <td valign="top">
+ <p>There is now a source page in the Smooks editor</p>
+ <p><img src="../images/smooks_src_editor.png"/></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Smooks wizard</b></td>
+ <td valign="top">
+ <p>There is now a Smooks wizard for creating a .smooks file</p>
+ <p><img src="../images/smooks_wizard.png"/></p>
+ </td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/vpe/vpe-news-3.0.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.0.0.CR1.html (rev 0)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.0.0.CR1.html 2008-12-18 00:42:31 UTC (rev 12667)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>What's New Visual Page Editor</title>
+</head>
+<body>
+<h1>What's New Visual Page Editor</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../esb/esb-news-1.1.0.Beta1.html">ESB News ></a></p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>General</h3>
+ <hr/>
+ </td>
+
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Richfaces 3.2</b></td>
+ <td valign="top"><p>
+ Richfaces 3.2 is now fully supported in code completion and visual page editor.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Code completion icons</b></td>
+ <td valign="top"><p>
+ Code completion now has icons illustrating what they are from. Currently we separate between resource bundles, seam and jsf components.
+ </p>
+
+ <p><img src="../images/vpe_iconcompletion.png"/></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+
+
+
+</table>
+
+</body>
+
+</html>
+
+
17 years
- 1
- 0
JBoss Tools SVN: r12666 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-12-17 19:08:02 -0500 (Wed, 17 Dec 2008)
New Revision: 12666
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3161 seam runtimes initialization removed from seam.core plugin
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2008-12-18 00:07:22 UTC (rev 12665)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2008-12-18 00:08:02 UTC (rev 12666)
@@ -58,8 +58,6 @@
node.put(SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS, "war"); //$NON-NLS-1$
node.put(SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE, "HSQL"); //$NON-NLS-1$
node.put(SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE, "DefaultDS"); //$NON-NLS-1$
- Map<String, SeamRuntime> map = new HashMap<String,SeamRuntime>();
-
try {
node.flush();
} catch (BackingStoreException e) {
17 years
- 1
- 0
JBoss Tools SVN: r12665 - branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-12-17 19:07:22 -0500 (Wed, 17 Dec 2008)
New Revision: 12665
Modified:
branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3161 seam runtimes initialization removed from seam.core plugin
Modified: branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java
===================================================================
--- branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2008-12-18 00:05:41 UTC (rev 12664)
+++ branches/jbosstools-3.0.0.CR1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2008-12-18 00:07:22 UTC (rev 12665)
@@ -58,52 +58,10 @@
node.put(SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS, "war"); //$NON-NLS-1$
node.put(SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE, "HSQL"); //$NON-NLS-1$
node.put(SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE, "DefaultDS"); //$NON-NLS-1$
- Map<String, SeamRuntime> map = new HashMap<String,SeamRuntime>();
-
- // Initialize Seam 1.2 Runtime from JBoss EAP
- String seamGenBuildPath = getSeamGenBuildPath(SEAM_1_2_HOME);
- File seamFolder = new File(seamGenBuildPath);
- if(seamFolder.exists() && seamFolder.isDirectory()) {
- SeamRuntime rt = new SeamRuntime();
- rt.setHomeDir(seamGenBuildPath);
- rt.setName("Seam " + SeamVersion.SEAM_1_2 + ".AP"); //$NON-NLS-1$ //$NON-NLS-2$
- rt.setDefault(true);
- rt.setVersion(SeamVersion.SEAM_1_2);
- map.put(rt.getName(), rt);
- }
- // Initialize Seam 2.0 Runtime from JBoss EAP
- seamGenBuildPath = getSeamGenBuildPath(SEAM_2_0_HOME);
- seamFolder = new File(seamGenBuildPath);
- if(seamFolder.exists() && seamFolder.isDirectory()) {
- SeamRuntime rt = new SeamRuntime();
- rt.setHomeDir(seamGenBuildPath);
- rt.setName("Seam " + SeamVersion.SEAM_2_0 + ".FP"); //$NON-NLS-1$ //$NON-NLS-2$
- rt.setDefault(true);
- rt.setVersion(SeamVersion.SEAM_2_0);
- map.put(rt.getName(), rt);
- }
- node.put(SeamProjectPreferences.RUNTIME_LIST, new SeamRuntimeListConverter().getString(map));
try {
node.flush();
} catch (BackingStoreException e) {
SeamCorePlugin.getPluginLog().logError(e);
}
}
-
- private String getSeamGenBuildPath(String seamHomePath) {
- String pluginLocation=null;
- try {
- pluginLocation = FileLocator.resolve(SeamCorePlugin.getDefault().getBundle().getEntry("/")).getFile(); //$NON-NLS-1$
- } catch (IOException e) {
- SeamCorePlugin.getPluginLog().logError(e);
- };
- File seamGenDir = new File(pluginLocation, seamHomePath);
- Path p = new Path(seamGenDir.getPath());
- p.makeAbsolute();
- if(p.toFile().exists()) {
- return p.toOSString();
- } else {
- return ""; //$NON-NLS-1$
- }
- }
}
17 years
- 1
- 0
JBoss Tools SVN: r12664 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-12-17 19:05:41 -0500 (Wed, 17 Dec 2008)
New Revision: 12664
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3161 seam runtimes initialization removed from seam.core plugin
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2008-12-17 22:02:33 UTC (rev 12663)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2008-12-18 00:05:41 UTC (rev 12664)
@@ -60,50 +60,11 @@
node.put(SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE, "DefaultDS"); //$NON-NLS-1$
Map<String, SeamRuntime> map = new HashMap<String,SeamRuntime>();
- // Initialize Seam 1.2 Runtime from JBoss EAP
- String seamGenBuildPath = getSeamGenBuildPath(SEAM_1_2_HOME);
- File seamFolder = new File(seamGenBuildPath);
- if(seamFolder.exists() && seamFolder.isDirectory()) {
- SeamRuntime rt = new SeamRuntime();
- rt.setHomeDir(seamGenBuildPath);
- rt.setName("Seam " + SeamVersion.SEAM_1_2 + ".AP"); //$NON-NLS-1$ //$NON-NLS-2$
- rt.setDefault(true);
- rt.setVersion(SeamVersion.SEAM_1_2);
- map.put(rt.getName(), rt);
- }
- // Initialize Seam 2.0 Runtime from JBoss EAP
- seamGenBuildPath = getSeamGenBuildPath(SEAM_2_0_HOME);
- seamFolder = new File(seamGenBuildPath);
- if(seamFolder.exists() && seamFolder.isDirectory()) {
- SeamRuntime rt = new SeamRuntime();
- rt.setHomeDir(seamGenBuildPath);
- rt.setName("Seam " + SeamVersion.SEAM_2_0 + ".FP"); //$NON-NLS-1$ //$NON-NLS-2$
- rt.setDefault(true);
- rt.setVersion(SeamVersion.SEAM_2_0);
- map.put(rt.getName(), rt);
- }
- node.put(SeamProjectPreferences.RUNTIME_LIST, new SeamRuntimeListConverter().getString(map));
try {
node.flush();
} catch (BackingStoreException e) {
SeamCorePlugin.getPluginLog().logError(e);
}
}
-
- private String getSeamGenBuildPath(String seamHomePath) {
- String pluginLocation=null;
- try {
- pluginLocation = FileLocator.resolve(SeamCorePlugin.getDefault().getBundle().getEntry("/")).getFile(); //$NON-NLS-1$
- } catch (IOException e) {
- SeamCorePlugin.getPluginLog().logError(e);
- };
- File seamGenDir = new File(pluginLocation, seamHomePath);
- Path p = new Path(seamGenDir.getPath());
- p.makeAbsolute();
- if(p.toFile().exists()) {
- return p.toOSString();
- } else {
- return ""; //$NON-NLS-1$
- }
- }
+
}
17 years
- 1
- 0
JBoss Tools SVN: r12663 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core: properties and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-17 17:02:33 -0500 (Wed, 17 Dec 2008)
New Revision: 12663
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/namespaceMap.properties
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.50.default.ports.properties
Log:
JBIDE-3415 for JBoss 5.0.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2008-12-17 21:23:13 UTC (rev 12662)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2008-12-17 22:02:33 UTC (rev 12663)
@@ -40,6 +40,7 @@
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.UnitedServerListener;
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
@@ -92,7 +93,7 @@
server2.getRuntime().loadAdapter(LocalJBossServerRuntime.class, null);
if(ajbsr != null ) {
IPath loc = server2.getRuntime().getLocation();
- IPath configFolder = loc.append("server").append(ajbsr.getJBossConfiguration());
+ IPath configFolder = loc.append(IJBossServerConstants.SERVER).append(ajbsr.getJBossConfiguration());
loadDefaults(server2, configFolder.toOSString());
helper.setAttribute(DEFAULTS_SET, true);
helper.save();
@@ -295,6 +296,38 @@
}
+ /*
+ * Namespace map
+ */
+ public Properties namespaceMap = null;
+ public Properties getNamespaceMap() {
+ if( namespaceMap == null )
+ loadNamespaceMap();
+ return (Properties)namespaceMap.clone();
+ }
+ protected void loadNamespaceMap() {
+ // TODO load from preferenes.
+ //If nothing's there, load from default
+ IPath p = new Path("properties").append("namespaceMap.properties");
+ if( p != null ) {
+ URL url = FileLocator.find(JBossServerCorePlugin.getDefault().getBundle(), p, null);
+ if( url != null ) {
+ Properties pr = new Properties();
+ try {
+ pr.load(url.openStream());
+ namespaceMap = pr;
+ return;
+ } catch(IOException ioe) {
+ }
+ }
+ }
+ namespaceMap = new Properties();
+ }
+ public void setNamespaceMap(Properties map) {
+ namespaceMap = map;
+ // TODO save to preferences
+ }
+
/*
* Static utility methods
*/
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2008-12-17 21:23:13 UTC (rev 12662)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2008-12-17 22:02:33 UTC (rev 12663)
@@ -24,10 +24,15 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import org.dom4j.Document;
import org.dom4j.Node;
import org.eclipse.core.runtime.Path;
+import org.jaxen.JaxenException;
+import org.jaxen.SimpleNamespaceContext;
+import org.jaxen.XPath;
+import org.jaxen.dom4j.Dom4jXPath;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
/**
@@ -109,8 +114,13 @@
for( int i = 0; i < files.length; i++ ) {
fileLoc = new Path(baseDir).append(files[i]).toOSString();
Document d = getRepository().getDocument(fileLoc);
- if( d != null )
- nodeList = d.selectNodes(xpathPattern);
+ if( d != null ) {
+ XPath xpath = new Dom4jXPath( xpathPattern );
+ Map map = XPathModel.getDefault().getNamespaceMap();
+ xpath.setNamespaceContext( new SimpleNamespaceContext( map));
+ List nodes = xpath.selectNodes(d);
+ nodeList = xpath.selectNodes(d);
+ }
if( nodeList != null && nodeList.size() > 0 )
resultList.add(new XPathFileResult(this, fileLoc, nodeList));
}
@@ -118,6 +128,9 @@
} catch( IllegalStateException ise ) {
// cannot load TODO log?
results = new XPathFileResult[0];
+ } catch( JaxenException je ) {
+ // cannot load TODO log?
+ results = new XPathFileResult[0];
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.50.default.ports.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.50.default.ports.properties 2008-12-17 21:23:13 UTC (rev 12662)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.50.default.ports.properties 2008-12-17 22:02:33 UTC (rev 12663)
@@ -2,16 +2,37 @@
# as few files as possible. Each matching file *WILL* be scanned
# and cached, regardless of if there's a match.
-JNDI=//server/mbean[@name='jboss:service=Naming']/attribute[@name='Port']
-JNDI_FILE=conf/jboss-service.xml
-JBoss_Web=//Server/Service[@name='jboss.web']/Connector[count(@sslProtocol) = 0 and (count(@protocol) = 0 or @protocol = 'HTTP/1.1')]
-JBoss_Web_ATTRIBUTE=port
-JBoss_Web_FILE=deployers/jbossweb.deployer/server.xml
-JNDI_RMI=//server/mbean[@name='jboss:service=Naming']/attribute[@name='RmiPort']
-JNDI_RMI_FILE=conf/jboss-service.xml
-JRMP_Invoker=//server/mbean[@name='jboss:service=invoker,type=jrmp']/attribute[@name='RMIObjectPort']
-JRMP_Invoker_FILE=conf/jboss-service.xml
-Pooled_Invoker=//server/mbean[@name='jboss:service=invoker,type=pooled']/attribute[@name='ServerBindPort']
-Pooled_Invoker_FILE=conf/jboss-service.xml
-Web_Services=//server/mbean[@name='jboss:service=WebService']/attribute[@name='Port']
-Web_Services_FILE=conf/jboss-service.xml
+JNDI=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=Naming' and jboss_bean-deployer_2:property='Port']/jboss_bean-deployer_2:property[@name='port']
+JNDI_FILE=conf/bootstrap/bindings.xml
+JBoss_Web=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss.web:service=WebServer'][not(jboss_bean-deployer_2:property='HttpsConnector')]/jboss_bean-deployer_2:property[@name='port']
+JBoss_Web_FILE=conf/bootstrap/bindings.xml
+HTTPS_Connector=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss.web:service=WebServer'][jboss_bean-deployer_2:property='HttpsConnector']/jboss_bean-deployer_2:property[@name='port']
+HTTPS_Connector_FILE=conf/bootstrap/bindings.xml
+Unified_Invoker_Connector=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='UnifiedInvokerConnector']/jboss_bean-deployer_2:property[@name='port']
+Unified_Invoker_Connector_FILE=conf/bootstrap/bindings.xml
+RMI_JRMP_Invoker=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=invoker,type=jrmp']/jboss_bean-deployer_2:property[@name='port']
+RMI_JRMP_Invoker_FILE=conf/bootstrap/bindings.xml
+Pooled_Invoker=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=invoker,type=pooled']/jboss_bean-deployer_2:property[@name='port']
+Pooled_Invoker_FILE=conf/bootstrap/bindings.xml
+HA_JNDI_Port=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=HAJNDI'][jboss_bean-deployer_2:property='Port']/jboss_bean-deployer_2:property[@name='port']
+HA_JNDI_Port_FILE=conf/bootstrap/bindings.xml
+RMI_JNDI_Port=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=HAJNDI'][jboss_bean-deployer_2:property='RmiPort']/jboss_bean-deployer_2:property[@name='port']
+RMI_JNDI_Port_FILE=conf/bootstrap/bindings.xml
+HA_RMI_JRMP_Invoker=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=invoker,type=jrmpha']/jboss_bean-deployer_2:property[@name='port']
+HA_RMI_JRMP_Invoker_FILE=conf/bootstrap/bindings.xml
+HA_Pooled_Invoker=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=invoker,type=pooledha']/jboss_bean-deployer_2:property[@name='port']
+HA_Pooled_Invoker_FILE=conf/bootstrap/bindings.xml
+IIOP_Deploy=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss:service=CorbaORB']/jboss_bean-deployer_2:property[@name='port']
+IIOP_Deploy_FILE=conf/bootstrap/bindings.xml
+SNMP_Manager=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss.jmx:name=SnmpAgent,service=trapd,type=logger']/jboss_bean-deployer_2:property[@name='port']
+SNMP_Manager_FILE=conf/bootstrap/bindings.xml
+SNMP_Adapter=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss.jmx:name=SnmpAgent,service=snmp,type=adaptor']/jboss_bean-deployer_2:property[@name='port']
+SNMP_Adapter_FILE=conf/bootstrap/bindings.xml
+JMX_Remoting=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss.remoting:service=JMXConnectorServer,protocol=rmi']/jboss_bean-deployer_2:property[@name='port']
+JMX_Remoting_FILE=conf/bootstrap/bindings.xml
+JBM_Bisocket_Connector=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='jboss.messaging:service=Connector,transport=bisocket']/jboss_bean-deployer_2:property[@name='port']
+JBM_Bisocket_Connector_FILE=conf/bootstrap/bindings.xml
+Transaction_Recovery_Manager=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='TransactionManager'][jboss_bean-deployer_2:property='recoveryManager']/jboss_bean-deployer_2:property[@name='port']
+Transaction_Recovery_Manager_FILE=conf/bootstrap/bindings.xml
+Transaction_SocketProcessId=/deployment/jboss_bean-deployer_2:bean/jboss_bean-deployer_2:constructor/jboss_bean-deployer_2:parameter/jboss_bean-deployer_2:set/jboss_bean-deployer_2:bean[jboss_bean-deployer_2:property='TransactionManager'][jboss_bean-deployer_2:property='socketProcessId']/jboss_bean-deployer_2:property[@name='port']
+Transaction_SocketProcessId_FILE=conf/bootstrap/bindings.xml
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/namespaceMap.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/namespaceMap.properties (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/namespaceMap.properties 2008-12-17 22:02:33 UTC (rev 12663)
@@ -0,0 +1 @@
+jboss_bean-deployer_2=urn:jboss:bean-deployer:2.0
17 years
- 1
- 0
JBoss Tools SVN: r12662 - in trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core: build and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-17 16:23:13 -0500 (Wed, 17 Dec 2008)
New Revision: 12662
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/EventManager.java
Log:
freetesting with max - builder failed when registration wasn't done yet
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties 2008-12-17 20:53:59 UTC (rev 12661)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties 2008-12-17 21:23:13 UTC (rev 12662)
@@ -13,7 +13,7 @@
ProjectCannotBeBuilt=Project {0} does not exist or has no .packages file. Skipping.
ErrorBuilding=An error occurred while building project archives
-ErrorLocatingRootNode=An error occurred locating the root node for {0}
+ErrorLocatingRootNode=An error occurred locating the descriptor for {0}
BuildingProject=Building project {0}
BuildingArchive=Building archive {0}
CreatingFolders=Creating folders
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-17 20:53:59 UTC (rev 12661)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-17 21:23:13 UTC (rev 12662)
@@ -60,6 +60,7 @@
*/
public class ArchiveBuildDelegate {
+ public static int CANNOT_REGISTER_CODE = 31415;
public ArchiveBuildDelegate() {
}
@@ -74,11 +75,17 @@
IArchiveModelRootNode root = ArchivesModel.instance().getRoot(project);
if( root == null ) {
- IStatus s = new Status(IStatus.ERROR, ArchivesCore.PLUGIN_ID,
+ // Adding a code here. If the project isn't registered yet,
+ // the eclipse code can launch a registration job
+ if(ArchivesModel.instance().canReregister(project)) {
+ ArchivesModel.instance().registerProject(project, monitor);
+ return Status.OK_STATUS;
+ }
+ IStatus s = new Status(IStatus.ERROR, ArchivesCore.PLUGIN_ID, CANNOT_REGISTER_CODE,
ArchivesCore.bind(ArchivesCoreMessages.ErrorLocatingRootNode, project.toOSString()), null);
EventManager.error(null, new IStatus[]{s});
monitor.done();
- return s;
+ return Status.OK_STATUS;
} else {
IArchiveNode[] nodes = root.getChildren(IArchiveNode.TYPE_ARCHIVE);
ArrayList<IStatus> errors = new ArrayList<IStatus>();
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/EventManager.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/EventManager.java 2008-12-17 20:53:59 UTC (rev 12661)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/EventManager.java 2008-12-17 21:23:13 UTC (rev 12662)
@@ -184,7 +184,8 @@
for( int i = 0; i < listeners.length; i++ ) {
try {
listeners[i].modelChanged(delta);
- } catch(Exception e ) {logError(e);} }
+ } catch(Exception e ) {logError(e);}
+ }
}
17 years
- 1
- 0
JBoss Tools SVN: r12661 - in trunk/archives/plugins: org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-17 15:53:59 -0500 (Wed, 17 Dec 2008)
New Revision: 12661
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java
Log:
freetesting with max
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties 2008-12-17 20:53:32 UTC (rev 12660)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties 2008-12-17 20:53:59 UTC (rev 12661)
@@ -25,7 +25,7 @@
ErrorUpdatingModel=Error updating model changes
ErrorUnmarshallingFile=Error unmarshalling packages file {0}
ArchivesListenerError=Archives listener error
-CouldNotCreateScanner=Could not create directory scanner
+CouldNotCreateScanner=Could not create directory scanner: {0}
ErrorAddChildNode=Error adding child node {0}
RemovingFileset=Removing fileset: {0}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-17 20:53:32 UTC (rev 12660)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-17 20:53:59 UTC (rev 12661)
@@ -90,6 +90,13 @@
errors.addAll(Arrays.asList(fullArchiveBuild(((IArchive)nodes[i]),
new SubProgressMonitor(monitor, 1000), false)));
}
+// IStatus result;
+// for( int i = 0; i < nodes.length; i++ ) {
+// result = fullArchiveBuild(((IArchive)nodes[i]),
+// new SubProgressMonitor(monitor, 1000), false);
+// if( !result.isOK())
+// errors.addAll(Arrays.asList(result.getChildren()));
+// }
EventManager.finishedBuild(project);
EventManager.error(null, errors.toArray(new IStatus[errors.size()]));
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java 2008-12-17 20:53:32 UTC (rev 12660)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java 2008-12-17 20:53:59 UTC (rev 12661)
@@ -46,6 +46,9 @@
for( int i = 0; i < multi.length; i++ ) {
ms.add(multi[i]);
}
+ if( ms.getSeverity() == IStatus.OK)
+ return;
+
if( PrefsInitializer.getBoolean(PrefsInitializer.PREF_SHOW_BUILD_ERROR_DIALOG)) {
Display.getDefault().asyncExec(new Runnable() {
public void run() {
17 years
- 1
- 0