https://bugzilla.redhat.com/show_bug.cgi?id=1168846 - change Called

Activity to Called Element.

6 files changed, 6 insertions, 6 deletions

diff --git a/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/messages.properties b/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/messages.properties
index bbacd442..56ab42a0 100644
--- a/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/messages.properties
+++ b/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/property/messages.properties
@@ -13,7 +13,7 @@ JbpmActivityDetailComposite_On_Exit_Script=On Exit Script
 JbpmActivityDetailComposite_Script_Details=Script Details
 JbpmCallActivityDetailComposite_Invalid_Empty=Please enter the ID of a callable activity
 JbpmCallActivityDetailComposite_Message=Enter the ID of a callable activity
-JbpmCallActivityDetailComposite_Title=Called Activity
+JbpmCallActivityDetailComposite_Title=Called Element
 JbpmCommonEventDetailComposite_TimerScriptLanguage=Language
 JbpmCommonEventDetailComposite_Error_Message=Can not add more than one Event Definition
 JbpmCommonEventDetailComposite_Error_Title=Not Supported
diff --git a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/CallActivityPropertiesAdapter.java b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/CallActivityPropertiesAdapter.java
index 35a0db10..07dd14df 100644
--- a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/CallActivityPropertiesAdapter.java
+++ b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/CallActivityPropertiesAdapter.java
@@ -54,7 +54,7 @@ public class CallActivityPropertiesAdapter extends ActivityPropertiesAdapter<Cal
 			new RootElementRefFeatureDescriptor<CallActivity>(adapterFactory,object,ce) {
 				@Override
 				public String getLabel(Object context) {
-					return Messages.CallActivityPropertiesAdapter_Called_Activity;
+					return Messages.CallActivityPropertiesAdapter_Called_Element;
 				}
 				
 				@Override
diff --git a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/Messages.java b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/Messages.java
index 788f26af..d0ecb05f 100644
--- a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/Messages.java
+++ b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/Messages.java
@@ -4,7 +4,7 @@ import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
 	private static final String BUNDLE_NAME = "org.eclipse.bpmn2.modeler.ui.adapters.properties.messages"; //$NON-NLS-1$
-	public static String CallActivityPropertiesAdapter_Called_Activity;
+	public static String CallActivityPropertiesAdapter_Called_Element;
 	public static String DataAssociationPropertiesAdapter_Source;
 	public static String DataAssociationPropertiesAdapter_Target;
 	public static String ErrorPropertiesAdapter_Error_Code;
diff --git a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/messages.properties b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/messages.properties
index edc63c95..35448553 100644
--- a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/messages.properties
+++ b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/messages.properties
@@ -1,4 +1,4 @@
-CallActivityPropertiesAdapter_Called_Activity=Called Activity
+CallActivityPropertiesAdapter_Called_Element=Called Element
 DataAssociationPropertiesAdapter_Source=Source
 DataAssociationPropertiesAdapter_Target=Target
 ErrorPropertiesAdapter_Error_Code=Error Code: 
diff --git a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/CallActivityFeatureContainer.java b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/CallActivityFeatureContainer.java
index d2105cc3..bd4b241f 100644
--- a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/CallActivityFeatureContainer.java
+++ b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/activity/subprocess/CallActivityFeatureContainer.java
@@ -141,7 +141,7 @@ public class CallActivityFeatureContainer extends AbstractActivityFeatureContain
 				super.delete(context);
 				
 				if (canDeleteCalledActivity) {
-					// if the called activity is a Process, it may have its own
+					// if the called element is a Process, it may have its own
 					// diagram page which needs to be removed as well.
 					BPMNDiagram bpmnDiagram = DIUtils.findBPMNDiagram(calledActivity);
 					if (bpmnDiagram != null) {
diff --git a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/views/outline/FlowElementTreeEditPart.java b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/views/outline/FlowElementTreeEditPart.java
index 2d4ebaef..9094be9c 100644
--- a/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/views/outline/FlowElementTreeEditPart.java
+++ b/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/views/outline/FlowElementTreeEditPart.java
@@ -68,7 +68,7 @@ public class FlowElementTreeEditPart extends AbstractGraphicsTreeEditPart {
 			retList.addAll(ca.getParticipantRefs());
 		}
 		else if (elem instanceof CallActivity) {
-			// render a Call Activity with its called activity target
+			// render a Call Activity with its called element target
 			// (a Process or Global Task) as the child node.
 			CallableElement target = ((CallActivity)elem).getCalledElementRef();
 			if (target!=null) {