ACT-1498: IntermediateCatchEventActivitiBehaviour name does not match other ActivityBehavior's

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/IntermediateCatchEventActivitiBehaviour.java → modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/IntermediateCatchEventActivityBehavior.java

@@ -15,7 +15,7 @@ package org.activiti.engine.impl.bpmn.behavior;
 import org.activiti.engine.impl.pvm.delegate.ActivityExecution;
 
 
-public class IntermediateCatchEventActivitiBehaviour extends AbstractBpmnActivityBehavior {
+public class IntermediateCatchEventActivityBehavior extends AbstractBpmnActivityBehavior {
 
 
   public void execute(ActivityExecution execution) throws Exception {

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java

@@ -83,7 +83,7 @@ import org.activiti.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.EventBasedGatewayActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.EventSubProcessStartEventActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.ExclusiveGatewayActivityBehavior;
-import org.activiti.engine.impl.bpmn.behavior.IntermediateCatchEventActivitiBehaviour;
+import org.activiti.engine.impl.bpmn.behavior.IntermediateCatchEventActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.MultiInstanceActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.WebServiceActivityBehavior;
 import org.activiti.engine.impl.bpmn.data.AbstractDataAssociation;
@@ -851,7 +851,7 @@ public class BpmnParse implements BpmnXMLConstants {
       }
       
       // Catch event behavior is the same for all types
-      nestedActivity.setActivityBehavior(activityBehaviorFactory.createIntermediateCatchEvent(event));
+      nestedActivity.setActivityBehavior(activityBehaviorFactory.createIntermediateCatchEventActivityBehavior(event));
       
       if (eventDefinition instanceof TimerEventDefinition) {
         createIntermediateTimerEventDefinition((TimerEventDefinition) eventDefinition, nestedActivity, isAfterEventBasedGateway);
@@ -2108,7 +2108,7 @@ public class BpmnParse implements BpmnXMLConstants {
     } else if (destinationActivity == null) {
       throw new ActivitiException("Invalid destination '" + sequenceFlow.getTargetRef() + "' of sequence flow '" + sequenceFlow.getId() + "'");
     } else if(!(sourceActivity.getActivityBehavior() instanceof EventBasedGatewayActivityBehavior)
-            && destinationActivity.getActivityBehavior() instanceof IntermediateCatchEventActivitiBehaviour
+            && destinationActivity.getActivityBehavior() instanceof IntermediateCatchEventActivityBehavior
             && (destinationActivity.getParentActivity() != null)
             && (destinationActivity.getParentActivity().getActivityBehavior() instanceof EventBasedGatewayActivityBehavior)) {
       

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/factory/ActivityBehaviorFactory.java

@@ -46,7 +46,7 @@ import org.activiti.engine.impl.bpmn.behavior.EventBasedGatewayActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.EventSubProcessStartEventActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.ExclusiveGatewayActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.InclusiveGatewayActivityBehavior;
-import org.activiti.engine.impl.bpmn.behavior.IntermediateCatchEventActivitiBehaviour;
+import org.activiti.engine.impl.bpmn.behavior.IntermediateCatchEventActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.IntermediateThrowCompensationEventActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.IntermediateThrowNoneEventActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.IntermediateThrowSignalEventActivityBehavior;
@@ -161,7 +161,7 @@ public interface ActivityBehaviorFactory {
 
   public abstract TransactionActivityBehavior createTransactionActivityBehavior(Transaction transaction);
 
-  public abstract IntermediateCatchEventActivitiBehaviour createIntermediateCatchEvent(IntermediateCatchEvent intermediateCatchEvent);
+  public abstract IntermediateCatchEventActivityBehavior createIntermediateCatchEventActivityBehavior(IntermediateCatchEvent intermediateCatchEvent);
 
   public abstract IntermediateThrowNoneEventActivityBehavior createIntermediateThrowNoneEventActivityBehavior(ThrowEvent throwEvent);
 

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/factory/DefaultActivityBehaviorFactory.java

@@ -51,7 +51,7 @@ import org.activiti.engine.impl.bpmn.behavior.EventBasedGatewayActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.EventSubProcessStartEventActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.ExclusiveGatewayActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.InclusiveGatewayActivityBehavior;
-import org.activiti.engine.impl.bpmn.behavior.IntermediateCatchEventActivitiBehaviour;
+import org.activiti.engine.impl.bpmn.behavior.IntermediateCatchEventActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.IntermediateThrowCompensationEventActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.IntermediateThrowNoneEventActivityBehavior;
 import org.activiti.engine.impl.bpmn.behavior.IntermediateThrowSignalEventActivityBehavior;
@@ -297,8 +297,8 @@ public class DefaultActivityBehaviorFactory extends AbstractBehaviorFactory impl
 
   // Intermediate Events
   
-  public IntermediateCatchEventActivitiBehaviour createIntermediateCatchEvent(IntermediateCatchEvent intermediateCatchEvent) {
-    return new IntermediateCatchEventActivitiBehaviour();
+  public IntermediateCatchEventActivityBehavior createIntermediateCatchEventActivityBehavior(IntermediateCatchEvent intermediateCatchEvent) {
+    return new IntermediateCatchEventActivityBehavior();
   }
 
   public IntermediateThrowNoneEventActivityBehavior createIntermediateThrowNoneEventActivityBehavior(ThrowEvent throwEvent) {