Author: bbrodt
Date: 2011-02-25 16:47:58 -0500 (Fri, 25 Feb 2011)
New Revision: 29352
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELContentDescriber.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/InsertInContainerCommand.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties
Log:
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELContentDescriber.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELContentDescriber.java 2011-02-25
21:43:45 UTC (rev 29351)
+++
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELContentDescriber.java 2011-02-25
21:47:58 UTC (rev 29352)
@@ -34,6 +34,8 @@
public class BPELContentDescriber implements ITextContentDescriber {
private static final String WSBPEL_2_NAMESPACE =
"http://docs.oasis-open.org/wsbpel/2.0/process/executable"; //$NON-NLS-1$
+ //
https://issues.jboss.org/browse/JBIDE-8068
+ private static final String WSBPEL_2_ABSTRACT_NAMESPACE =
"http://docs.oasis-open.org/wsbpel/2.0/process/abstract"; //$NON-NLS-1$
private static final String ROOT_ELEMENT = "process"; //$NON-NLS-1$
private RootElementParser parser;
@@ -79,7 +81,8 @@
if (ROOT_ELEMENT.equals(qName.localpart)) {
String namespace = fNamespaceContext.getURI(qName.prefix);
- if (WSBPEL_2_NAMESPACE.equals(namespace))
+ //
https://issues.jboss.org/browse/JBIDE-8068
+ if (WSBPEL_2_NAMESPACE.equals(namespace) ||
WSBPEL_2_ABSTRACT_NAMESPACE.equals(namespace))
throw new AcceptedException(qName.localpart);
else
throw new RejectedException();
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java 2011-02-25
21:43:45 UTC (rev 29351)
+++
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java 2011-02-25
21:47:58 UTC (rev 29352)
@@ -690,6 +690,9 @@
public static String Editor_load_error;
public static String Editor_design_page_error;
+ public static String Make_Process_Abstract_Title;
+ public static String Make_Process_Abstract_Message;
+
static {
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/InsertInContainerCommand.java
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/InsertInContainerCommand.java 2011-02-25
21:43:45 UTC (rev 29351)
+++
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/commands/InsertInContainerCommand.java 2011-02-25
21:47:58 UTC (rev 29352)
@@ -11,6 +11,8 @@
package org.eclipse.bpel.ui.commands;
import org.eclipse.bpel.model.Activity;
+import org.eclipse.bpel.model.OpaqueActivity;
+import org.eclipse.bpel.model.Process;
import org.eclipse.bpel.model.util.BPELUtils;
import org.eclipse.bpel.model.util.ReconciliationHelper;
import org.eclipse.bpel.ui.Messages;
@@ -20,7 +22,9 @@
import org.eclipse.bpel.ui.util.BPELUtil;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.ui.PlatformUI;
import org.w3c.dom.Node;
@@ -64,6 +68,22 @@
@Override
public boolean canDoExecute() {
IContainer container = BPELUtil.adapt(parent, IContainer.class);
+
+ //
https://issues.jboss.org/browse/JBIDE-8068
+ // Adding an opaque activity will make the process abstract!
+ // Make sure this is what the user had intended.
+ if (child instanceof OpaqueActivity) {
+ Process process = BPELUtils.getProcess(parent);
+ if ( !BPELUtils.isAbstractProcess(process) ) {
+ if (!MessageDialog.openQuestion(PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getShell(),
+ Messages.Make_Process_Abstract_Title,
+ Messages.Make_Process_Abstract_Message)) {
+ return false;
+ }
+ }
+ }
+
return container.canAddObject(parent, child, before);
}
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties
===================================================================
---
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties 2011-02-25
21:43:45 UTC (rev 29351)
+++
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties 2011-02-25
21:47:58 UTC (rev 29352)
@@ -129,10 +129,7 @@
BPELPreferencePage_WSIL_EnterLocation = <enter location>
#
# This has \n for a reason. The wrapping in the widget works, but not as expected.
-BPELPreferencePage_WSIL_Description = \
-The document above contains links to other WSIL documents shown below.\n\
-You can add or remove WSIL links to/from the above document.\n\
-The result will be shown in the WSIL browser of the editor.
+BPELPreferencePage_WSIL_Description = The document above contains links to other WSIL
documents shown below.\nYou can add or remove WSIL links to/from the above document.\nThe
result will be shown in the WSIL browser of the editor.
#
BPELUIRegistry_Expression_language_editors_must_provide_expressionLanguage_and_class__8=Expression
language editors must provide expressionLanguage and class.
BPELUtil__unknown_URI__54=<unknown URI>
@@ -685,4 +682,8 @@
EditModelClient_wsdl_load_error=Unable to load the WSDL file {0}\n It may be corrupt, do
you want to continue?
EditModelClient_delete_error_title=File Delete Error
-EditModelClient_delete_error_message=Unable to delete the file. See Error Log for more
information.
\ No newline at end of file
+EditModelClient_delete_error_message=Unable to delete the file. See Error Log for more
information.
+
+Make_Process_Abstract_Title=Warning
+Make_Process_Abstract_Message=Opaque activities are only used in Abstract Processes\n\
+ Would you like to convert this process to make it Abstract?