commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gu...@apache.org
Subject svn commit: r960911 [12/15] - in /commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram: edit/commands/ edit/parts/ edit/policies/ navigator/ part/ providers/...
Date Tue, 06 Jul 2010 15:09:56 GMT
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ModelingVisualIDRegistry.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ModelingVisualIDRegistry.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ModelingVisualIDRegistry.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ModelingVisualIDRegistry.java Tue Jul  6 15:09:51 2010
@@ -157,10 +157,6 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return Parallel2EditPart.VISUAL_ID;
 			}
-			if (ModelingPackage.eINSTANCE.getAnchor().isSuperTypeOf(
-					domainElement.eClass())) {
-				return Anchor2EditPart.VISUAL_ID;
-			}
 			if (ModelingPackage.eINSTANCE.getFinalState().isSuperTypeOf(
 					domainElement.eClass())) {
 				return FinalState2EditPart.VISUAL_ID;
@@ -169,6 +165,14 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return State3EditPart.VISUAL_ID;
 			}
+			if (ModelingPackage.eINSTANCE.getDataModel().isSuperTypeOf(
+					domainElement.eClass())) {
+				return DataModel2EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getFinalize().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Finalize2EditPart.VISUAL_ID;
+			}
 			break;
 		case OnEntryOnEntryCompartmentEditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getIf().isSuperTypeOf(
@@ -222,17 +226,17 @@ public class ModelingVisualIDRegistry {
 				return ElseEditPart.VISUAL_ID;
 			}
 			break;
-		case SendSendCompartmentEditPart.VISUAL_ID:
+		case RaiseRaiseCompartmentEditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getParam().isSuperTypeOf(
 					domainElement.eClass())) {
-				return ParamEditPart.VISUAL_ID;
+				return Param6EditPart.VISUAL_ID;
 			}
 			if (ModelingPackage.eINSTANCE.getContent().isSuperTypeOf(
 					domainElement.eClass())) {
-				return ContentEditPart.VISUAL_ID;
+				return Content6EditPart.VISUAL_ID;
 			}
 			break;
-		case ContentContentCompartmentEditPart.VISUAL_ID:
+		case ContentContentCompartment6EditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getContent().isSuperTypeOf(
 					domainElement.eClass())) {
 				return Content2EditPart.VISUAL_ID;
@@ -244,6 +248,22 @@ public class ModelingVisualIDRegistry {
 				return Content2EditPart.VISUAL_ID;
 			}
 			break;
+		case SendSendCompartmentEditPart.VISUAL_ID:
+			if (ModelingPackage.eINSTANCE.getParam().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ParamEditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ContentEditPart.VISUAL_ID;
+			}
+			break;
+		case ContentContentCompartmentEditPart.VISUAL_ID:
+			if (ModelingPackage.eINSTANCE.getContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Content2EditPart.VISUAL_ID;
+			}
+			break;
 		case OnExitOnExitCompartmentEditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getIf().isSuperTypeOf(
 					domainElement.eClass())) {
@@ -296,6 +316,16 @@ public class ModelingVisualIDRegistry {
 				return ElseEditPart.VISUAL_ID;
 			}
 			break;
+		case RaiseRaiseCompartment2EditPart.VISUAL_ID:
+			if (ModelingPackage.eINSTANCE.getParam().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Param6EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Content6EditPart.VISUAL_ID;
+			}
+			break;
 		case SendSendCompartment2EditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getParam().isSuperTypeOf(
 					domainElement.eClass())) {
@@ -320,6 +350,78 @@ public class ModelingVisualIDRegistry {
 				return Content3EditPart.VISUAL_ID;
 			}
 			break;
+		case FinalizeFinalizeCompartmentEditPart.VISUAL_ID:
+			if (ModelingPackage.eINSTANCE.getIf().isSuperTypeOf(
+					domainElement.eClass())) {
+				return If3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getAssign().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Assign3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getRaise().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Raise3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getLog().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Log3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getValidate().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Validate3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getCancel().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Cancel3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getSend().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Send3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getParam().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Param7EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getScript().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Script4EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getExtenExecContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ExtenExecContent3EditPart.VISUAL_ID;
+			}
+			break;
+		case IfIfCompartment3EditPart.VISUAL_ID:
+			if (ModelingPackage.eINSTANCE.getElseIf().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ElseIfEditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getElse().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ElseEditPart.VISUAL_ID;
+			}
+			break;
+		case RaiseRaiseCompartment3EditPart.VISUAL_ID:
+			if (ModelingPackage.eINSTANCE.getParam().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Param6EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Content6EditPart.VISUAL_ID;
+			}
+			break;
+		case SendSendCompartment3EditPart.VISUAL_ID:
+			if (ModelingPackage.eINSTANCE.getParam().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ParamEditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ContentEditPart.VISUAL_ID;
+			}
+			break;
 		case ContentContentCompartment3EditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getContent().isSuperTypeOf(
 					domainElement.eClass())) {
@@ -331,10 +433,6 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return HistoryState2EditPart.VISUAL_ID;
 			}
-			if (ModelingPackage.eINSTANCE.getAnchor().isSuperTypeOf(
-					domainElement.eClass())) {
-				return AnchorEditPart.VISUAL_ID;
-			}
 			if (ModelingPackage.eINSTANCE.getParallel().isSuperTypeOf(
 					domainElement.eClass())) {
 				return Parallel3EditPart.VISUAL_ID;
@@ -351,16 +449,24 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return State2EditPart.VISUAL_ID;
 			}
+			if (ModelingPackage.eINSTANCE.getDataModel().isSuperTypeOf(
+					domainElement.eClass())) {
+				return DataModel2EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getInvoke().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Invoke2EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getFinalize().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Finalize3EditPart.VISUAL_ID;
+			}
 			break;
 		case ParallelParallelCompartment2EditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getHistoryState().isSuperTypeOf(
 					domainElement.eClass())) {
 				return HistoryState2EditPart.VISUAL_ID;
 			}
-			if (ModelingPackage.eINSTANCE.getAnchor().isSuperTypeOf(
-					domainElement.eClass())) {
-				return AnchorEditPart.VISUAL_ID;
-			}
 			if (ModelingPackage.eINSTANCE.getParallel().isSuperTypeOf(
 					domainElement.eClass())) {
 				return Parallel3EditPart.VISUAL_ID;
@@ -377,6 +483,18 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return State2EditPart.VISUAL_ID;
 			}
+			if (ModelingPackage.eINSTANCE.getDataModel().isSuperTypeOf(
+					domainElement.eClass())) {
+				return DataModel2EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getInvoke().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Invoke2EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getFinalize().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Finalize3EditPart.VISUAL_ID;
+			}
 			break;
 		case OnEntryOnEntryCompartment2EditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getIf().isSuperTypeOf(
@@ -487,10 +605,6 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return Parallel2EditPart.VISUAL_ID;
 			}
-			if (ModelingPackage.eINSTANCE.getAnchor().isSuperTypeOf(
-					domainElement.eClass())) {
-				return Anchor2EditPart.VISUAL_ID;
-			}
 			if (ModelingPackage.eINSTANCE.getFinalState().isSuperTypeOf(
 					domainElement.eClass())) {
 				return FinalState2EditPart.VISUAL_ID;
@@ -499,6 +613,14 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return State3EditPart.VISUAL_ID;
 			}
+			if (ModelingPackage.eINSTANCE.getDataModel().isSuperTypeOf(
+					domainElement.eClass())) {
+				return DataModel2EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getFinalize().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Finalize2EditPart.VISUAL_ID;
+			}
 			break;
 		case FinalStateFinalStateCompartmentEditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getDonedata().isSuperTypeOf(
@@ -639,10 +761,6 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return Parallel2EditPart.VISUAL_ID;
 			}
-			if (ModelingPackage.eINSTANCE.getAnchor().isSuperTypeOf(
-					domainElement.eClass())) {
-				return Anchor2EditPart.VISUAL_ID;
-			}
 			if (ModelingPackage.eINSTANCE.getFinalState().isSuperTypeOf(
 					domainElement.eClass())) {
 				return FinalState2EditPart.VISUAL_ID;
@@ -651,16 +769,136 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return State3EditPart.VISUAL_ID;
 			}
+			if (ModelingPackage.eINSTANCE.getDataModel().isSuperTypeOf(
+					domainElement.eClass())) {
+				return DataModel2EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getFinalize().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Finalize2EditPart.VISUAL_ID;
+			}
+			break;
+		case DataModelDataModelCompartment2EditPart.VISUAL_ID:
+			if (ModelingPackage.eINSTANCE.getData().isSuperTypeOf(
+					domainElement.eClass())) {
+				return DataEditPart.VISUAL_ID;
+			}
+			break;
+		case DataDataCompartmentEditPart.VISUAL_ID:
+			if (ModelingPackage.eINSTANCE.getContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Content5EditPart.VISUAL_ID;
+			}
+			break;
+		case ContentContentCompartment5EditPart.VISUAL_ID:
+			if (ModelingPackage.eINSTANCE.getContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Content2EditPart.VISUAL_ID;
+			}
+			break;
+		case FinalizeFinalizeCompartment2EditPart.VISUAL_ID:
+			if (ModelingPackage.eINSTANCE.getIf().isSuperTypeOf(
+					domainElement.eClass())) {
+				return If3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getAssign().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Assign3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getRaise().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Raise3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getLog().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Log3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getValidate().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Validate3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getCancel().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Cancel3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getSend().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Send3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getParam().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Param7EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getScript().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Script4EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getExtenExecContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ExtenExecContent3EditPart.VISUAL_ID;
+			}
+			break;
+		case InvokeInvokeCompartment2EditPart.VISUAL_ID:
+			if (ModelingPackage.eINSTANCE.getFinalize().isSuperTypeOf(
+					domainElement.eClass())) {
+				return FinalizeEditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getParam().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Param4EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Content3EditPart.VISUAL_ID;
+			}
+			break;
+		case FinalizeFinalizeCompartment3EditPart.VISUAL_ID:
+			if (ModelingPackage.eINSTANCE.getIf().isSuperTypeOf(
+					domainElement.eClass())) {
+				return If3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getAssign().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Assign3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getRaise().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Raise3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getLog().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Log3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getValidate().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Validate3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getCancel().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Cancel3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getSend().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Send3EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getParam().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Param7EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getScript().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Script4EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getExtenExecContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ExtenExecContent3EditPart.VISUAL_ID;
+			}
 			break;
 		case ParallelParallelCompartment3EditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getHistoryState().isSuperTypeOf(
 					domainElement.eClass())) {
 				return HistoryState2EditPart.VISUAL_ID;
 			}
-			if (ModelingPackage.eINSTANCE.getAnchor().isSuperTypeOf(
-					domainElement.eClass())) {
-				return AnchorEditPart.VISUAL_ID;
-			}
 			if (ModelingPackage.eINSTANCE.getParallel().isSuperTypeOf(
 					domainElement.eClass())) {
 				return Parallel3EditPart.VISUAL_ID;
@@ -677,23 +915,23 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return State2EditPart.VISUAL_ID;
 			}
-			break;
-		case DataModelDataModelCompartmentEditPart.VISUAL_ID:
-			if (ModelingPackage.eINSTANCE.getData().isSuperTypeOf(
+			if (ModelingPackage.eINSTANCE.getDataModel().isSuperTypeOf(
 					domainElement.eClass())) {
-				return DataEditPart.VISUAL_ID;
+				return DataModel2EditPart.VISUAL_ID;
 			}
-			break;
-		case DataDataCompartmentEditPart.VISUAL_ID:
-			if (ModelingPackage.eINSTANCE.getContent().isSuperTypeOf(
+			if (ModelingPackage.eINSTANCE.getInvoke().isSuperTypeOf(
 					domainElement.eClass())) {
-				return Content5EditPart.VISUAL_ID;
+				return Invoke2EditPart.VISUAL_ID;
+			}
+			if (ModelingPackage.eINSTANCE.getFinalize().isSuperTypeOf(
+					domainElement.eClass())) {
+				return Finalize3EditPart.VISUAL_ID;
 			}
 			break;
-		case ContentContentCompartment5EditPart.VISUAL_ID:
-			if (ModelingPackage.eINSTANCE.getContent().isSuperTypeOf(
+		case DataModelDataModelCompartmentEditPart.VISUAL_ID:
+			if (ModelingPackage.eINSTANCE.getData().isSuperTypeOf(
 					domainElement.eClass())) {
-				return Content2EditPart.VISUAL_ID;
+				return DataEditPart.VISUAL_ID;
 			}
 			break;
 		case FinalStateFinalStateCompartment2EditPart.VISUAL_ID:
@@ -829,6 +1067,24 @@ public class ModelingVisualIDRegistry {
 			if (RaiseEventEditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if (RaiseRaiseCompartmentEditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case Param6EditPart.VISUAL_ID:
+			if (ParamName6EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case Content6EditPart.VISUAL_ID:
+			if (ContentContentCompartment6EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case Content2EditPart.VISUAL_ID:
+			if (ContentContentCompartment2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case LogEditPart.VISUAL_ID:
 			if (LogExprEditPart.VISUAL_ID == nodeVisualID) {
@@ -863,11 +1119,6 @@ public class ModelingVisualIDRegistry {
 				return true;
 			}
 			break;
-		case Content2EditPart.VISUAL_ID:
-			if (ContentContentCompartment2EditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
 		case Param2EditPart.VISUAL_ID:
 			if (ParamName2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
@@ -908,6 +1159,9 @@ public class ModelingVisualIDRegistry {
 			if (RaiseEvent2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if (RaiseRaiseCompartment2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case Log2EditPart.VISUAL_ID:
 			if (LogExpr2EditPart.VISUAL_ID == nodeVisualID) {
@@ -959,6 +1213,68 @@ public class ModelingVisualIDRegistry {
 			if (WrappingLabel8EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if (FinalizeFinalizeCompartmentEditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case If3EditPart.VISUAL_ID:
+			if (IfCond3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (IfIfCompartment3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case Assign3EditPart.VISUAL_ID:
+			if (AssignDataid3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case Raise3EditPart.VISUAL_ID:
+			if (RaiseEvent3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (RaiseRaiseCompartment3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case Log3EditPart.VISUAL_ID:
+			if (LogExpr3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case Validate3EditPart.VISUAL_ID:
+			if (ValidateSchema3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case Cancel3EditPart.VISUAL_ID:
+			if (CancelSendid3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case Send3EditPart.VISUAL_ID:
+			if (SendEvent3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (SendSendCompartment3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case Param7EditPart.VISUAL_ID:
+			if (ParamName7EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case Script4EditPart.VISUAL_ID:
+			if (WrappingLabelEditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case ExtenExecContent3EditPart.VISUAL_ID:
+			if (WrappingLabel17EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case Param4EditPart.VISUAL_ID:
 			if (ParamName4EditPart.VISUAL_ID == nodeVisualID) {
@@ -993,11 +1309,6 @@ public class ModelingVisualIDRegistry {
 				return true;
 			}
 			break;
-		case AnchorEditPart.VISUAL_ID:
-			if (AnchorTypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
 		case Parallel3EditPart.VISUAL_ID:
 			if (ParallelId3EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
@@ -1030,11 +1341,6 @@ public class ModelingVisualIDRegistry {
 				return true;
 			}
 			break;
-		case Anchor2EditPart.VISUAL_ID:
-			if (AnchorType2EditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
 		case FinalState2EditPart.VISUAL_ID:
 			if (FinalStateId2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
@@ -1085,6 +1391,14 @@ public class ModelingVisualIDRegistry {
 				return true;
 			}
 			break;
+		case DataModel2EditPart.VISUAL_ID:
+			if (DataModelSchema2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (DataModelDataModelCompartment2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
 		case DataEditPart.VISUAL_ID:
 			if (DataIdEditPart.VISUAL_ID == nodeVisualID) {
 				return true;
@@ -1098,6 +1412,30 @@ public class ModelingVisualIDRegistry {
 				return true;
 			}
 			break;
+		case Finalize2EditPart.VISUAL_ID:
+			if (WrappingLabel18EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (FinalizeFinalizeCompartment2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case Invoke2EditPart.VISUAL_ID:
+			if (InvokeType2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (InvokeInvokeCompartment2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case Finalize3EditPart.VISUAL_ID:
+			if (WrappingLabel19EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (FinalizeFinalizeCompartment3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
 		case StateStateCompartmentEditPart.VISUAL_ID:
 			if (OnEntryEditPart.VISUAL_ID == nodeVisualID) {
 				return true;
@@ -1117,15 +1455,18 @@ public class ModelingVisualIDRegistry {
 			if (Parallel2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
-			if (Anchor2EditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
 			if (FinalState2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
 			if (State3EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if (DataModel2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Finalize2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case OnEntryOnEntryCompartmentEditPart.VISUAL_ID:
 			if (IfEditPart.VISUAL_ID == nodeVisualID) {
@@ -1167,15 +1508,15 @@ public class ModelingVisualIDRegistry {
 				return true;
 			}
 			break;
-		case SendSendCompartmentEditPart.VISUAL_ID:
-			if (ParamEditPart.VISUAL_ID == nodeVisualID) {
+		case RaiseRaiseCompartmentEditPart.VISUAL_ID:
+			if (Param6EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
-			if (ContentEditPart.VISUAL_ID == nodeVisualID) {
+			if (Content6EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
 			break;
-		case ContentContentCompartmentEditPart.VISUAL_ID:
+		case ContentContentCompartment6EditPart.VISUAL_ID:
 			if (Content2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
@@ -1185,6 +1526,19 @@ public class ModelingVisualIDRegistry {
 				return true;
 			}
 			break;
+		case SendSendCompartmentEditPart.VISUAL_ID:
+			if (ParamEditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (ContentEditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case ContentContentCompartmentEditPart.VISUAL_ID:
+			if (Content2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
 		case OnExitOnExitCompartmentEditPart.VISUAL_ID:
 			if (If2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
@@ -1225,6 +1579,14 @@ public class ModelingVisualIDRegistry {
 				return true;
 			}
 			break;
+		case RaiseRaiseCompartment2EditPart.VISUAL_ID:
+			if (Param6EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Content6EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
 		case SendSendCompartment2EditPart.VISUAL_ID:
 			if (ParamEditPart.VISUAL_ID == nodeVisualID) {
 				return true;
@@ -1244,6 +1606,62 @@ public class ModelingVisualIDRegistry {
 				return true;
 			}
 			break;
+		case FinalizeFinalizeCompartmentEditPart.VISUAL_ID:
+			if (If3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Assign3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Raise3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Log3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Validate3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Cancel3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Send3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Param7EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Script4EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (ExtenExecContent3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case IfIfCompartment3EditPart.VISUAL_ID:
+			if (ElseIfEditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (ElseEditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case RaiseRaiseCompartment3EditPart.VISUAL_ID:
+			if (Param6EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Content6EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case SendSendCompartment3EditPart.VISUAL_ID:
+			if (ParamEditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (ContentEditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
 		case ContentContentCompartment3EditPart.VISUAL_ID:
 			if (Content2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
@@ -1253,9 +1671,6 @@ public class ModelingVisualIDRegistry {
 			if (HistoryState2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
-			if (AnchorEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
 			if (Parallel3EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
@@ -1268,14 +1683,20 @@ public class ModelingVisualIDRegistry {
 			if (State2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if (DataModel2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Invoke2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Finalize3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case ParallelParallelCompartment2EditPart.VISUAL_ID:
 			if (HistoryState2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
-			if (AnchorEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
 			if (Parallel3EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
@@ -1288,6 +1709,15 @@ public class ModelingVisualIDRegistry {
 			if (State2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if (DataModel2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Invoke2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Finalize3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case OnEntryOnEntryCompartment2EditPart.VISUAL_ID:
 			if (IfEditPart.VISUAL_ID == nodeVisualID) {
@@ -1372,15 +1802,18 @@ public class ModelingVisualIDRegistry {
 			if (Parallel2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
-			if (Anchor2EditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
 			if (FinalState2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
 			if (State3EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if (DataModel2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Finalize2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case FinalStateFinalStateCompartmentEditPart.VISUAL_ID:
 			if (DonedataEditPart.VISUAL_ID == nodeVisualID) {
@@ -1489,21 +1922,111 @@ public class ModelingVisualIDRegistry {
 			if (Parallel2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
-			if (Anchor2EditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
 			if (FinalState2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
 			if (State3EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if (DataModel2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Finalize2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
-		case ParallelParallelCompartment3EditPart.VISUAL_ID:
-			if (HistoryState2EditPart.VISUAL_ID == nodeVisualID) {
+		case DataModelDataModelCompartment2EditPart.VISUAL_ID:
+			if (DataEditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case DataDataCompartmentEditPart.VISUAL_ID:
+			if (Content5EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case ContentContentCompartment5EditPart.VISUAL_ID:
+			if (Content2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case FinalizeFinalizeCompartment2EditPart.VISUAL_ID:
+			if (If3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Assign3EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
-			if (AnchorEditPart.VISUAL_ID == nodeVisualID) {
+			if (Raise3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Log3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Validate3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Cancel3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Send3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Param7EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Script4EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (ExtenExecContent3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case InvokeInvokeCompartment2EditPart.VISUAL_ID:
+			if (FinalizeEditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Param4EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Content3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case FinalizeFinalizeCompartment3EditPart.VISUAL_ID:
+			if (If3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Assign3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Raise3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Log3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Validate3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Cancel3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Send3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Param7EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Script4EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (ExtenExecContent3EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
+		case ParallelParallelCompartment3EditPart.VISUAL_ID:
+			if (HistoryState2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
 			if (Parallel3EditPart.VISUAL_ID == nodeVisualID) {
@@ -1518,19 +2041,18 @@ public class ModelingVisualIDRegistry {
 			if (State2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
-			break;
-		case DataModelDataModelCompartmentEditPart.VISUAL_ID:
-			if (DataEditPart.VISUAL_ID == nodeVisualID) {
+			if (DataModel2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
-			break;
-		case DataDataCompartmentEditPart.VISUAL_ID:
-			if (Content5EditPart.VISUAL_ID == nodeVisualID) {
+			if (Invoke2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			if (Finalize3EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
 			break;
-		case ContentContentCompartment5EditPart.VISUAL_ID:
-			if (Content2EditPart.VISUAL_ID == nodeVisualID) {
+		case DataModelDataModelCompartmentEditPart.VISUAL_ID:
+			if (DataEditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
 			break;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingElementTypes.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingElementTypes.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingElementTypes.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingElementTypes.java Tue Jul  6 15:09:51 2010
@@ -111,6 +111,16 @@ public class ModelingElementTypes extend
 	/**
 	 * @generated
 	 */
+	public static final IElementType Param_3051 = getElementType("org.apache.commons.scxml.modeling.diagram.Param_3051"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	public static final IElementType Content_3052 = getElementType("org.apache.commons.scxml.modeling.diagram.Content_3052"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
 	public static final IElementType Log_3007 = getElementType("org.apache.commons.scxml.modeling.diagram.Log_3007"); //$NON-NLS-1$
 	/**
 	 * @generated
@@ -203,6 +213,56 @@ public class ModelingElementTypes extend
 	/**
 	 * @generated
 	 */
+	public static final IElementType If_3053 = getElementType("org.apache.commons.scxml.modeling.diagram.If_3053"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	public static final IElementType Assign_3054 = getElementType("org.apache.commons.scxml.modeling.diagram.Assign_3054"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	public static final IElementType Raise_3055 = getElementType("org.apache.commons.scxml.modeling.diagram.Raise_3055"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	public static final IElementType Log_3056 = getElementType("org.apache.commons.scxml.modeling.diagram.Log_3056"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	public static final IElementType Validate_3057 = getElementType("org.apache.commons.scxml.modeling.diagram.Validate_3057"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	public static final IElementType Cancel_3058 = getElementType("org.apache.commons.scxml.modeling.diagram.Cancel_3058"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	public static final IElementType Send_3059 = getElementType("org.apache.commons.scxml.modeling.diagram.Send_3059"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	public static final IElementType Param_3060 = getElementType("org.apache.commons.scxml.modeling.diagram.Param_3060"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	public static final IElementType Script_3061 = getElementType("org.apache.commons.scxml.modeling.diagram.Script_3061"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	public static final IElementType ExtenExecContent_3062 = getElementType("org.apache.commons.scxml.modeling.diagram.ExtenExecContent_3062"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
 	public static final IElementType Param_3028 = getElementType("org.apache.commons.scxml.modeling.diagram.Param_3028"); //$NON-NLS-1$
 	/**
 	 * @generated
@@ -227,10 +287,6 @@ public class ModelingElementTypes extend
 	/**
 	 * @generated
 	 */
-	public static final IElementType Anchor_3034 = getElementType("org.apache.commons.scxml.modeling.diagram.Anchor_3034"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
 	public static final IElementType Parallel_3035 = getElementType("org.apache.commons.scxml.modeling.diagram.Parallel_3035"); //$NON-NLS-1$
 	/**
 	 * @generated
@@ -247,10 +303,6 @@ public class ModelingElementTypes extend
 	/**
 	 * @generated
 	 */
-	public static final IElementType Anchor_3039 = getElementType("org.apache.commons.scxml.modeling.diagram.Anchor_3039"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
 	public static final IElementType FinalState_3040 = getElementType("org.apache.commons.scxml.modeling.diagram.FinalState_3040"); //$NON-NLS-1$
 	/**
 	 * @generated
@@ -279,6 +331,11 @@ public class ModelingElementTypes extend
 	/**
 	 * @generated
 	 */
+	public static final IElementType DataModel_3063 = getElementType("org.apache.commons.scxml.modeling.diagram.DataModel_3063"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
 	public static final IElementType Data_3047 = getElementType("org.apache.commons.scxml.modeling.diagram.Data_3047"); //$NON-NLS-1$
 	/**
 	 * @generated
@@ -287,6 +344,21 @@ public class ModelingElementTypes extend
 	/**
 	 * @generated
 	 */
+	public static final IElementType Finalize_3064 = getElementType("org.apache.commons.scxml.modeling.diagram.Finalize_3064"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	public static final IElementType Invoke_3065 = getElementType("org.apache.commons.scxml.modeling.diagram.Invoke_3065"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
+	public static final IElementType Finalize_3066 = getElementType("org.apache.commons.scxml.modeling.diagram.Finalize_3066"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
 	public static final IElementType Transition_4001 = getElementType("org.apache.commons.scxml.modeling.diagram.Transition_4001"); //$NON-NLS-1$
 
 	/**
@@ -428,6 +500,12 @@ public class ModelingElementTypes extend
 
 			elements.put(Raise_3006, ModelingPackage.eINSTANCE.getRaise());
 
+			elements.put(Param_3051, ModelingPackage.eINSTANCE.getParam());
+
+			elements.put(Content_3052, ModelingPackage.eINSTANCE.getContent());
+
+			elements.put(Content_3013, ModelingPackage.eINSTANCE.getContent());
+
 			elements.put(Log_3007, ModelingPackage.eINSTANCE.getLog());
 
 			elements
@@ -441,8 +519,6 @@ public class ModelingElementTypes extend
 
 			elements.put(Content_3012, ModelingPackage.eINSTANCE.getContent());
 
-			elements.put(Content_3013, ModelingPackage.eINSTANCE.getContent());
-
 			elements.put(Param_3014, ModelingPackage.eINSTANCE.getParam());
 
 			elements.put(Script_3015, ModelingPackage.eINSTANCE.getScript());
@@ -479,6 +555,28 @@ public class ModelingElementTypes extend
 			elements
 					.put(Finalize_3027, ModelingPackage.eINSTANCE.getFinalize());
 
+			elements.put(If_3053, ModelingPackage.eINSTANCE.getIf());
+
+			elements.put(Assign_3054, ModelingPackage.eINSTANCE.getAssign());
+
+			elements.put(Raise_3055, ModelingPackage.eINSTANCE.getRaise());
+
+			elements.put(Log_3056, ModelingPackage.eINSTANCE.getLog());
+
+			elements
+					.put(Validate_3057, ModelingPackage.eINSTANCE.getValidate());
+
+			elements.put(Cancel_3058, ModelingPackage.eINSTANCE.getCancel());
+
+			elements.put(Send_3059, ModelingPackage.eINSTANCE.getSend());
+
+			elements.put(Param_3060, ModelingPackage.eINSTANCE.getParam());
+
+			elements.put(Script_3061, ModelingPackage.eINSTANCE.getScript());
+
+			elements.put(ExtenExecContent_3062, ModelingPackage.eINSTANCE
+					.getExtenExecContent());
+
 			elements.put(Param_3028, ModelingPackage.eINSTANCE.getParam());
 
 			elements.put(Content_3029, ModelingPackage.eINSTANCE.getContent());
@@ -495,8 +593,6 @@ public class ModelingElementTypes extend
 			elements.put(HistoryState_3033, ModelingPackage.eINSTANCE
 					.getHistoryState());
 
-			elements.put(Anchor_3034, ModelingPackage.eINSTANCE.getAnchor());
-
 			elements
 					.put(Parallel_3035, ModelingPackage.eINSTANCE.getParallel());
 
@@ -506,8 +602,6 @@ public class ModelingElementTypes extend
 
 			elements.put(State_3038, ModelingPackage.eINSTANCE.getState());
 
-			elements.put(Anchor_3039, ModelingPackage.eINSTANCE.getAnchor());
-
 			elements.put(FinalState_3040, ModelingPackage.eINSTANCE
 					.getFinalState());
 
@@ -524,10 +618,21 @@ public class ModelingElementTypes extend
 
 			elements.put(State_3046, ModelingPackage.eINSTANCE.getState());
 
+			elements.put(DataModel_3063, ModelingPackage.eINSTANCE
+					.getDataModel());
+
 			elements.put(Data_3047, ModelingPackage.eINSTANCE.getData());
 
 			elements.put(Content_3048, ModelingPackage.eINSTANCE.getContent());
 
+			elements
+					.put(Finalize_3064, ModelingPackage.eINSTANCE.getFinalize());
+
+			elements.put(Invoke_3065, ModelingPackage.eINSTANCE.getInvoke());
+
+			elements
+					.put(Finalize_3066, ModelingPackage.eINSTANCE.getFinalize());
+
 			elements.put(Transition_4001, ModelingPackage.eINSTANCE
 					.getTransition());
 		}
@@ -559,13 +664,15 @@ public class ModelingElementTypes extend
 			KNOWN_ELEMENT_TYPES.add(Else_3004);
 			KNOWN_ELEMENT_TYPES.add(Assign_3005);
 			KNOWN_ELEMENT_TYPES.add(Raise_3006);
+			KNOWN_ELEMENT_TYPES.add(Param_3051);
+			KNOWN_ELEMENT_TYPES.add(Content_3052);
+			KNOWN_ELEMENT_TYPES.add(Content_3013);
 			KNOWN_ELEMENT_TYPES.add(Log_3007);
 			KNOWN_ELEMENT_TYPES.add(Validate_3008);
 			KNOWN_ELEMENT_TYPES.add(Cancel_3009);
 			KNOWN_ELEMENT_TYPES.add(Send_3010);
 			KNOWN_ELEMENT_TYPES.add(Param_3011);
 			KNOWN_ELEMENT_TYPES.add(Content_3012);
-			KNOWN_ELEMENT_TYPES.add(Content_3013);
 			KNOWN_ELEMENT_TYPES.add(Param_3014);
 			KNOWN_ELEMENT_TYPES.add(Script_3015);
 			KNOWN_ELEMENT_TYPES.add(ExtenExecContent_3049);
@@ -582,18 +689,26 @@ public class ModelingElementTypes extend
 			KNOWN_ELEMENT_TYPES.add(ExtenExecContent_3050);
 			KNOWN_ELEMENT_TYPES.add(Invoke_3026);
 			KNOWN_ELEMENT_TYPES.add(Finalize_3027);
+			KNOWN_ELEMENT_TYPES.add(If_3053);
+			KNOWN_ELEMENT_TYPES.add(Assign_3054);
+			KNOWN_ELEMENT_TYPES.add(Raise_3055);
+			KNOWN_ELEMENT_TYPES.add(Log_3056);
+			KNOWN_ELEMENT_TYPES.add(Validate_3057);
+			KNOWN_ELEMENT_TYPES.add(Cancel_3058);
+			KNOWN_ELEMENT_TYPES.add(Send_3059);
+			KNOWN_ELEMENT_TYPES.add(Param_3060);
+			KNOWN_ELEMENT_TYPES.add(Script_3061);
+			KNOWN_ELEMENT_TYPES.add(ExtenExecContent_3062);
 			KNOWN_ELEMENT_TYPES.add(Param_3028);
 			KNOWN_ELEMENT_TYPES.add(Content_3029);
 			KNOWN_ELEMENT_TYPES.add(InitialState_3030);
 			KNOWN_ELEMENT_TYPES.add(HistoryState_3031);
 			KNOWN_ELEMENT_TYPES.add(Parallel_3032);
 			KNOWN_ELEMENT_TYPES.add(HistoryState_3033);
-			KNOWN_ELEMENT_TYPES.add(Anchor_3034);
 			KNOWN_ELEMENT_TYPES.add(Parallel_3035);
 			KNOWN_ELEMENT_TYPES.add(OnEntry_3036);
 			KNOWN_ELEMENT_TYPES.add(OnExit_3037);
 			KNOWN_ELEMENT_TYPES.add(State_3038);
-			KNOWN_ELEMENT_TYPES.add(Anchor_3039);
 			KNOWN_ELEMENT_TYPES.add(FinalState_3040);
 			KNOWN_ELEMENT_TYPES.add(Donedata_3041);
 			KNOWN_ELEMENT_TYPES.add(Param_3042);
@@ -601,8 +716,12 @@ public class ModelingElementTypes extend
 			KNOWN_ELEMENT_TYPES.add(OnEntry_3044);
 			KNOWN_ELEMENT_TYPES.add(OnExit_3045);
 			KNOWN_ELEMENT_TYPES.add(State_3046);
+			KNOWN_ELEMENT_TYPES.add(DataModel_3063);
 			KNOWN_ELEMENT_TYPES.add(Data_3047);
 			KNOWN_ELEMENT_TYPES.add(Content_3048);
+			KNOWN_ELEMENT_TYPES.add(Finalize_3064);
+			KNOWN_ELEMENT_TYPES.add(Invoke_3065);
+			KNOWN_ELEMENT_TYPES.add(Finalize_3066);
 			KNOWN_ELEMENT_TYPES.add(Transition_4001);
 		}
 		return KNOWN_ELEMENT_TYPES.contains(elementType);

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingModelingAssistantProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingModelingAssistantProvider.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingModelingAssistantProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingModelingAssistantProvider.java Tue Jul  6 15:09:51 2010
@@ -27,14 +27,21 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment4EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment5EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment6EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartmentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.DataDataCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelDataModelCompartment2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelDataModelCompartmentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.DonedataDonedataCompartmentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateFinalStateCompartment2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateFinalStateCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeFinalizeCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeFinalizeCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeFinalizeCompartmentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.If2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.If3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.IfEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeInvokeCompartment2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeInvokeCompartmentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryOnEntryCompartment2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryOnEntryCompartment3EditPart;
@@ -45,7 +52,11 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartment2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartment3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.RaiseRaiseCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.RaiseRaiseCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.RaiseRaiseCompartmentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.SendSendCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.SendSendCompartment3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.SendSendCompartmentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ServiceTemplateEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartment2EditPart;
@@ -91,6 +102,12 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.Else_3004);
 			return types;
 		}
+		if (editPart instanceof If3EditPart) {
+			List types = new ArrayList();
+			types.add(ModelingElementTypes.ElseIf_3003);
+			types.add(ModelingElementTypes.Else_3004);
+			return types;
+		}
 		if (editPart instanceof StateStateCompartmentEditPart) {
 			List types = new ArrayList();
 			types.add(ModelingElementTypes.OnEntry_3001);
@@ -99,9 +116,10 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.InitialState_3030);
 			types.add(ModelingElementTypes.HistoryState_3031);
 			types.add(ModelingElementTypes.Parallel_3032);
-			types.add(ModelingElementTypes.Anchor_3039);
 			types.add(ModelingElementTypes.FinalState_3040);
 			types.add(ModelingElementTypes.State_3046);
+			types.add(ModelingElementTypes.DataModel_3063);
+			types.add(ModelingElementTypes.Finalize_3064);
 			return types;
 		}
 		if (editPart instanceof OnEntryOnEntryCompartmentEditPart) {
@@ -118,13 +136,13 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.ExtenExecContent_3049);
 			return types;
 		}
-		if (editPart instanceof SendSendCompartmentEditPart) {
+		if (editPart instanceof RaiseRaiseCompartmentEditPart) {
 			List types = new ArrayList();
-			types.add(ModelingElementTypes.Param_3011);
-			types.add(ModelingElementTypes.Content_3012);
+			types.add(ModelingElementTypes.Param_3051);
+			types.add(ModelingElementTypes.Content_3052);
 			return types;
 		}
-		if (editPart instanceof ContentContentCompartmentEditPart) {
+		if (editPart instanceof ContentContentCompartment6EditPart) {
 			List types = new ArrayList();
 			types.add(ModelingElementTypes.Content_3013);
 			return types;
@@ -134,6 +152,17 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.Content_3013);
 			return types;
 		}
+		if (editPart instanceof SendSendCompartmentEditPart) {
+			List types = new ArrayList();
+			types.add(ModelingElementTypes.Param_3011);
+			types.add(ModelingElementTypes.Content_3012);
+			return types;
+		}
+		if (editPart instanceof ContentContentCompartmentEditPart) {
+			List types = new ArrayList();
+			types.add(ModelingElementTypes.Content_3013);
+			return types;
+		}
 		if (editPart instanceof OnExitOnExitCompartmentEditPart) {
 			List types = new ArrayList();
 			types.add(ModelingElementTypes.If_3017);
@@ -148,6 +177,12 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.ExtenExecContent_3050);
 			return types;
 		}
+		if (editPart instanceof RaiseRaiseCompartment2EditPart) {
+			List types = new ArrayList();
+			types.add(ModelingElementTypes.Param_3051);
+			types.add(ModelingElementTypes.Content_3052);
+			return types;
+		}
 		if (editPart instanceof SendSendCompartment2EditPart) {
 			List types = new ArrayList();
 			types.add(ModelingElementTypes.Param_3011);
@@ -161,6 +196,32 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.Content_3029);
 			return types;
 		}
+		if (editPart instanceof FinalizeFinalizeCompartmentEditPart) {
+			List types = new ArrayList();
+			types.add(ModelingElementTypes.If_3053);
+			types.add(ModelingElementTypes.Assign_3054);
+			types.add(ModelingElementTypes.Raise_3055);
+			types.add(ModelingElementTypes.Log_3056);
+			types.add(ModelingElementTypes.Validate_3057);
+			types.add(ModelingElementTypes.Cancel_3058);
+			types.add(ModelingElementTypes.Send_3059);
+			types.add(ModelingElementTypes.Param_3060);
+			types.add(ModelingElementTypes.Script_3061);
+			types.add(ModelingElementTypes.ExtenExecContent_3062);
+			return types;
+		}
+		if (editPart instanceof RaiseRaiseCompartment3EditPart) {
+			List types = new ArrayList();
+			types.add(ModelingElementTypes.Param_3051);
+			types.add(ModelingElementTypes.Content_3052);
+			return types;
+		}
+		if (editPart instanceof SendSendCompartment3EditPart) {
+			List types = new ArrayList();
+			types.add(ModelingElementTypes.Param_3011);
+			types.add(ModelingElementTypes.Content_3012);
+			return types;
+		}
 		if (editPart instanceof ContentContentCompartment3EditPart) {
 			List types = new ArrayList();
 			types.add(ModelingElementTypes.Content_3013);
@@ -169,21 +230,25 @@ public class ModelingModelingAssistantPr
 		if (editPart instanceof ParallelParallelCompartmentEditPart) {
 			List types = new ArrayList();
 			types.add(ModelingElementTypes.HistoryState_3033);
-			types.add(ModelingElementTypes.Anchor_3034);
 			types.add(ModelingElementTypes.Parallel_3035);
 			types.add(ModelingElementTypes.OnEntry_3036);
 			types.add(ModelingElementTypes.OnExit_3037);
 			types.add(ModelingElementTypes.State_3038);
+			types.add(ModelingElementTypes.DataModel_3063);
+			types.add(ModelingElementTypes.Invoke_3065);
+			types.add(ModelingElementTypes.Finalize_3066);
 			return types;
 		}
 		if (editPart instanceof ParallelParallelCompartment2EditPart) {
 			List types = new ArrayList();
 			types.add(ModelingElementTypes.HistoryState_3033);
-			types.add(ModelingElementTypes.Anchor_3034);
 			types.add(ModelingElementTypes.Parallel_3035);
 			types.add(ModelingElementTypes.OnEntry_3036);
 			types.add(ModelingElementTypes.OnExit_3037);
 			types.add(ModelingElementTypes.State_3038);
+			types.add(ModelingElementTypes.DataModel_3063);
+			types.add(ModelingElementTypes.Invoke_3065);
+			types.add(ModelingElementTypes.Finalize_3066);
 			return types;
 		}
 		if (editPart instanceof OnEntryOnEntryCompartment2EditPart) {
@@ -222,9 +287,10 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.InitialState_3030);
 			types.add(ModelingElementTypes.HistoryState_3031);
 			types.add(ModelingElementTypes.Parallel_3032);
-			types.add(ModelingElementTypes.Anchor_3039);
 			types.add(ModelingElementTypes.FinalState_3040);
 			types.add(ModelingElementTypes.State_3046);
+			types.add(ModelingElementTypes.DataModel_3063);
+			types.add(ModelingElementTypes.Finalize_3064);
 			return types;
 		}
 		if (editPart instanceof FinalStateFinalStateCompartmentEditPart) {
@@ -281,22 +347,13 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.InitialState_3030);
 			types.add(ModelingElementTypes.HistoryState_3031);
 			types.add(ModelingElementTypes.Parallel_3032);
-			types.add(ModelingElementTypes.Anchor_3039);
 			types.add(ModelingElementTypes.FinalState_3040);
 			types.add(ModelingElementTypes.State_3046);
+			types.add(ModelingElementTypes.DataModel_3063);
+			types.add(ModelingElementTypes.Finalize_3064);
 			return types;
 		}
-		if (editPart instanceof ParallelParallelCompartment3EditPart) {
-			List types = new ArrayList();
-			types.add(ModelingElementTypes.HistoryState_3033);
-			types.add(ModelingElementTypes.Anchor_3034);
-			types.add(ModelingElementTypes.Parallel_3035);
-			types.add(ModelingElementTypes.OnEntry_3036);
-			types.add(ModelingElementTypes.OnExit_3037);
-			types.add(ModelingElementTypes.State_3038);
-			return types;
-		}
-		if (editPart instanceof DataModelDataModelCompartmentEditPart) {
+		if (editPart instanceof DataModelDataModelCompartment2EditPart) {
 			List types = new ArrayList();
 			types.add(ModelingElementTypes.Data_3047);
 			return types;
@@ -311,6 +368,58 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.Content_3013);
 			return types;
 		}
+		if (editPart instanceof FinalizeFinalizeCompartment2EditPart) {
+			List types = new ArrayList();
+			types.add(ModelingElementTypes.If_3053);
+			types.add(ModelingElementTypes.Assign_3054);
+			types.add(ModelingElementTypes.Raise_3055);
+			types.add(ModelingElementTypes.Log_3056);
+			types.add(ModelingElementTypes.Validate_3057);
+			types.add(ModelingElementTypes.Cancel_3058);
+			types.add(ModelingElementTypes.Send_3059);
+			types.add(ModelingElementTypes.Param_3060);
+			types.add(ModelingElementTypes.Script_3061);
+			types.add(ModelingElementTypes.ExtenExecContent_3062);
+			return types;
+		}
+		if (editPart instanceof InvokeInvokeCompartment2EditPart) {
+			List types = new ArrayList();
+			types.add(ModelingElementTypes.Finalize_3027);
+			types.add(ModelingElementTypes.Param_3028);
+			types.add(ModelingElementTypes.Content_3029);
+			return types;
+		}
+		if (editPart instanceof FinalizeFinalizeCompartment3EditPart) {
+			List types = new ArrayList();
+			types.add(ModelingElementTypes.If_3053);
+			types.add(ModelingElementTypes.Assign_3054);
+			types.add(ModelingElementTypes.Raise_3055);
+			types.add(ModelingElementTypes.Log_3056);
+			types.add(ModelingElementTypes.Validate_3057);
+			types.add(ModelingElementTypes.Cancel_3058);
+			types.add(ModelingElementTypes.Send_3059);
+			types.add(ModelingElementTypes.Param_3060);
+			types.add(ModelingElementTypes.Script_3061);
+			types.add(ModelingElementTypes.ExtenExecContent_3062);
+			return types;
+		}
+		if (editPart instanceof ParallelParallelCompartment3EditPart) {
+			List types = new ArrayList();
+			types.add(ModelingElementTypes.HistoryState_3033);
+			types.add(ModelingElementTypes.Parallel_3035);
+			types.add(ModelingElementTypes.OnEntry_3036);
+			types.add(ModelingElementTypes.OnExit_3037);
+			types.add(ModelingElementTypes.State_3038);
+			types.add(ModelingElementTypes.DataModel_3063);
+			types.add(ModelingElementTypes.Invoke_3065);
+			types.add(ModelingElementTypes.Finalize_3066);
+			return types;
+		}
+		if (editPart instanceof DataModelDataModelCompartmentEditPart) {
+			List types = new ArrayList();
+			types.add(ModelingElementTypes.Data_3047);
+			return types;
+		}
 		if (editPart instanceof FinalStateFinalStateCompartment2EditPart) {
 			List types = new ArrayList();
 			types.add(ModelingElementTypes.Donedata_3041);

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingParserProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingParserProvider.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingParserProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingParserProvider.java Tue Jul  6 15:09:51 2010
@@ -17,13 +17,14 @@
 package org.apache.commons.scxml.modeling.diagram.providers;
 
 import org.apache.commons.scxml.modeling.ModelingPackage;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorType2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorTypeEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignDataid2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignDataid3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignDataidEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.CancelSendid2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.CancelSendid3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.CancelSendidEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.DataIdEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelSchema2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelSchemaEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ElseIfCondEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateId2EditPart;
@@ -31,9 +32,12 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateId2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateIdEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.IfCond2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.IfCond3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.IfCondEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeType2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeTypeEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.LogExpr2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.LogExpr3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.LogExprEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelId2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelId3EditPart;
@@ -42,16 +46,21 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ParamName3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ParamName4EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ParamName5EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParamName6EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ParamName7EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ParamNameEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.RaiseEvent2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.RaiseEvent3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.RaiseEventEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.SendEvent2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.SendEvent3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.SendEventEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.StateId2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.StateId3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.StateIdEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.TransitionCondEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ValidateSchema2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ValidateSchema3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ValidateSchemaEditPart;
 import org.apache.commons.scxml.modeling.diagram.parsers.MessageFormatParser;
 import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
@@ -276,6 +285,31 @@ public class ModelingParserProvider exte
 	/**
 	 * @generated
 	 */
+	private IParser paramName_5054Parser;
+
+	/**
+	 * @generated
+	 */
+	private IParser getParamName_5054Parser() {
+		if (paramName_5054Parser == null) {
+			paramName_5054Parser = createParamName_5054Parser();
+		}
+		return paramName_5054Parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected IParser createParamName_5054Parser() {
+		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
+				.getParam_Name(), };
+		MessageFormatParser parser = new MessageFormatParser(features);
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
 	private IParser logExpr_5007Parser;
 
 	/**
@@ -651,6 +685,206 @@ public class ModelingParserProvider exte
 	/**
 	 * @generated
 	 */
+	private IParser ifCond_5055Parser;
+
+	/**
+	 * @generated
+	 */
+	private IParser getIfCond_5055Parser() {
+		if (ifCond_5055Parser == null) {
+			ifCond_5055Parser = createIfCond_5055Parser();
+		}
+		return ifCond_5055Parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected IParser createIfCond_5055Parser() {
+		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
+				.getIf_Cond(), };
+		MessageFormatParser parser = new MessageFormatParser(features);
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	private IParser assignDataid_5056Parser;
+
+	/**
+	 * @generated
+	 */
+	private IParser getAssignDataid_5056Parser() {
+		if (assignDataid_5056Parser == null) {
+			assignDataid_5056Parser = createAssignDataid_5056Parser();
+		}
+		return assignDataid_5056Parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected IParser createAssignDataid_5056Parser() {
+		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
+				.getAssign_Dataid(), };
+		MessageFormatParser parser = new MessageFormatParser(features);
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	private IParser raiseEvent_5057Parser;
+
+	/**
+	 * @generated
+	 */
+	private IParser getRaiseEvent_5057Parser() {
+		if (raiseEvent_5057Parser == null) {
+			raiseEvent_5057Parser = createRaiseEvent_5057Parser();
+		}
+		return raiseEvent_5057Parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected IParser createRaiseEvent_5057Parser() {
+		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
+				.getRaise_Event(), };
+		MessageFormatParser parser = new MessageFormatParser(features);
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	private IParser logExpr_5058Parser;
+
+	/**
+	 * @generated
+	 */
+	private IParser getLogExpr_5058Parser() {
+		if (logExpr_5058Parser == null) {
+			logExpr_5058Parser = createLogExpr_5058Parser();
+		}
+		return logExpr_5058Parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected IParser createLogExpr_5058Parser() {
+		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
+				.getLog_Expr(), };
+		MessageFormatParser parser = new MessageFormatParser(features);
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	private IParser validateSchema_5059Parser;
+
+	/**
+	 * @generated
+	 */
+	private IParser getValidateSchema_5059Parser() {
+		if (validateSchema_5059Parser == null) {
+			validateSchema_5059Parser = createValidateSchema_5059Parser();
+		}
+		return validateSchema_5059Parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected IParser createValidateSchema_5059Parser() {
+		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
+				.getValidate_Schema(), };
+		MessageFormatParser parser = new MessageFormatParser(features);
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	private IParser cancelSendid_5060Parser;
+
+	/**
+	 * @generated
+	 */
+	private IParser getCancelSendid_5060Parser() {
+		if (cancelSendid_5060Parser == null) {
+			cancelSendid_5060Parser = createCancelSendid_5060Parser();
+		}
+		return cancelSendid_5060Parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected IParser createCancelSendid_5060Parser() {
+		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
+				.getCancel_Sendid(), };
+		MessageFormatParser parser = new MessageFormatParser(features);
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	private IParser sendEvent_5061Parser;
+
+	/**
+	 * @generated
+	 */
+	private IParser getSendEvent_5061Parser() {
+		if (sendEvent_5061Parser == null) {
+			sendEvent_5061Parser = createSendEvent_5061Parser();
+		}
+		return sendEvent_5061Parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected IParser createSendEvent_5061Parser() {
+		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
+				.getSend_Event(), };
+		MessageFormatParser parser = new MessageFormatParser(features);
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	private IParser paramName_5062Parser;
+
+	/**
+	 * @generated
+	 */
+	private IParser getParamName_5062Parser() {
+		if (paramName_5062Parser == null) {
+			paramName_5062Parser = createParamName_5062Parser();
+		}
+		return paramName_5062Parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected IParser createParamName_5062Parser() {
+		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
+				.getParam_Name(), };
+		MessageFormatParser parser = new MessageFormatParser(features);
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
 	private IParser paramName_5027Parser;
 
 	/**
@@ -751,31 +985,6 @@ public class ModelingParserProvider exte
 	/**
 	 * @generated
 	 */
-	private IParser anchorType_5032Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getAnchorType_5032Parser() {
-		if (anchorType_5032Parser == null) {
-			anchorType_5032Parser = createAnchorType_5032Parser();
-		}
-		return anchorType_5032Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createAnchorType_5032Parser() {
-		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
-				.getAnchor_Type(), };
-		MessageFormatParser parser = new MessageFormatParser(features);
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
 	private IParser parallelId_5043Parser;
 
 	/**
@@ -826,31 +1035,6 @@ public class ModelingParserProvider exte
 	/**
 	 * @generated
 	 */
-	private IParser anchorType_5035Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getAnchorType_5035Parser() {
-		if (anchorType_5035Parser == null) {
-			anchorType_5035Parser = createAnchorType_5035Parser();
-		}
-		return anchorType_5035Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createAnchorType_5035Parser() {
-		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
-				.getAnchor_Type(), };
-		MessageFormatParser parser = new MessageFormatParser(features);
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
 	private IParser finalStateId_5040Parser;
 
 	/**
@@ -926,6 +1110,31 @@ public class ModelingParserProvider exte
 	/**
 	 * @generated
 	 */
+	private IParser dataModelSchema_5065Parser;
+
+	/**
+	 * @generated
+	 */
+	private IParser getDataModelSchema_5065Parser() {
+		if (dataModelSchema_5065Parser == null) {
+			dataModelSchema_5065Parser = createDataModelSchema_5065Parser();
+		}
+		return dataModelSchema_5065Parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected IParser createDataModelSchema_5065Parser() {
+		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
+				.getDataModel_Schema(), };
+		MessageFormatParser parser = new MessageFormatParser(features);
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
 	private IParser dataId_5049Parser;
 
 	/**
@@ -951,6 +1160,31 @@ public class ModelingParserProvider exte
 	/**
 	 * @generated
 	 */
+	private IParser invokeType_5067Parser;
+
+	/**
+	 * @generated
+	 */
+	private IParser getInvokeType_5067Parser() {
+		if (invokeType_5067Parser == null) {
+			invokeType_5067Parser = createInvokeType_5067Parser();
+		}
+		return invokeType_5067Parser;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected IParser createInvokeType_5067Parser() {
+		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
+				.getInvoke_Type(), };
+		MessageFormatParser parser = new MessageFormatParser(features);
+		return parser;
+	}
+
+	/**
+	 * @generated
+	 */
 	private IParser transitionCond_6001Parser;
 
 	/**
@@ -994,6 +1228,8 @@ public class ModelingParserProvider exte
 			return getAssignDataid_5004Parser();
 		case RaiseEventEditPart.VISUAL_ID:
 			return getRaiseEvent_5006Parser();
+		case ParamName6EditPart.VISUAL_ID:
+			return getParamName_5054Parser();
 		case LogExprEditPart.VISUAL_ID:
 			return getLogExpr_5007Parser();
 		case ValidateSchemaEditPart.VISUAL_ID:
@@ -1024,6 +1260,22 @@ public class ModelingParserProvider exte
 			return getSendEvent_5023Parser();
 		case InvokeTypeEditPart.VISUAL_ID:
 			return getInvokeType_5028Parser();
+		case IfCond3EditPart.VISUAL_ID:
+			return getIfCond_5055Parser();
+		case AssignDataid3EditPart.VISUAL_ID:
+			return getAssignDataid_5056Parser();
+		case RaiseEvent3EditPart.VISUAL_ID:
+			return getRaiseEvent_5057Parser();
+		case LogExpr3EditPart.VISUAL_ID:
+			return getLogExpr_5058Parser();
+		case ValidateSchema3EditPart.VISUAL_ID:
+			return getValidateSchema_5059Parser();
+		case CancelSendid3EditPart.VISUAL_ID:
+			return getCancelSendid_5060Parser();
+		case SendEvent3EditPart.VISUAL_ID:
+			return getSendEvent_5061Parser();
+		case ParamName7EditPart.VISUAL_ID:
+			return getParamName_5062Parser();
 		case ParamName4EditPart.VISUAL_ID:
 			return getParamName_5027Parser();
 		case HistoryStateIdEditPart.VISUAL_ID:
@@ -1032,22 +1284,22 @@ public class ModelingParserProvider exte
 			return getParallelId_5044Parser();
 		case HistoryStateId2EditPart.VISUAL_ID:
 			return getHistoryStateId_5031Parser();
-		case AnchorTypeEditPart.VISUAL_ID:
-			return getAnchorType_5032Parser();
 		case ParallelId3EditPart.VISUAL_ID:
 			return getParallelId_5043Parser();
 		case StateId2EditPart.VISUAL_ID:
 			return getStateId_5042Parser();
-		case AnchorType2EditPart.VISUAL_ID:
-			return getAnchorType_5035Parser();
 		case FinalStateId2EditPart.VISUAL_ID:
 			return getFinalStateId_5040Parser();
 		case ParamName5EditPart.VISUAL_ID:
 			return getParamName_5036Parser();
 		case StateId3EditPart.VISUAL_ID:
 			return getStateId_5041Parser();
+		case DataModelSchema2EditPart.VISUAL_ID:
+			return getDataModelSchema_5065Parser();
 		case DataIdEditPart.VISUAL_ID:
 			return getDataId_5049Parser();
+		case InvokeType2EditPart.VISUAL_ID:
+			return getInvokeType_5067Parser();
 		case TransitionCondEditPart.VISUAL_ID:
 			return getTransitionCond_6001Parser();
 		}



Mime
View raw message