commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gu...@apache.org
Subject svn commit: r947362 [2/2] - 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/helpers/ edit/parts/ edit/policies/ navigator/ part...
Date Sun, 23 May 2010 05:36:09 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/edit/policies/OnEntryOnEntryCompartment3CanonicalEditPolicy.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/edit/policies/OnEntryOnEntryCompartment3CanonicalEditPolicy.java?rev=947362&r1=947361&r2=947362&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/edit/policies/OnEntryOnEntryCompartment3CanonicalEditPolicy.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/edit/policies/OnEntryOnEntryCompartment3CanonicalEditPolicy.java Sun May 23 05:36:08 2010
@@ -26,6 +26,7 @@ import java.util.Set;
 import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.CancelEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.IfEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.LogEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Param2EditPart;
@@ -79,6 +80,7 @@ public class OnEntryOnEntryCompartment3C
 		case SendEditPart.VISUAL_ID:
 		case Param2EditPart.VISUAL_ID:
 		case Script2EditPart.VISUAL_ID:
+		case ExtenExecContentEditPart.VISUAL_ID:
 			if (!semanticChildren.contains(view.getElement())) {
 				return true;
 			}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnEntryOnEntryCompartment3ItemSemanticEditPolicy.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/edit/policies/OnEntryOnEntryCompartment3ItemSemanticEditPolicy.java?rev=947362&r1=947361&r2=947362&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/edit/policies/OnEntryOnEntryCompartment3ItemSemanticEditPolicy.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/edit/policies/OnEntryOnEntryCompartment3ItemSemanticEditPolicy.java Sun May 23 05:36:08 2010
@@ -19,6 +19,7 @@ package org.apache.commons.scxml.modelin
 import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.AssignCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.CancelCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.ExtenExecContentCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.IfCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.LogCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Param2CreateCommand;
@@ -103,6 +104,13 @@ public class OnEntryOnEntryCompartment3I
 			}
 			return getGEFWrapper(new Script2CreateCommand(req));
 		}
+		if (ModelingElementTypes.ExtenExecContent_3049 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getOnEntry_ExecutableContext());
+			}
+			return getGEFWrapper(new ExtenExecContentCreateCommand(req));
+		}
 		return super.getCreateCommand(req);
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnEntryOnEntryCompartmentCanonicalEditPolicy.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/edit/policies/OnEntryOnEntryCompartmentCanonicalEditPolicy.java?rev=947362&r1=947361&r2=947362&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/edit/policies/OnEntryOnEntryCompartmentCanonicalEditPolicy.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/edit/policies/OnEntryOnEntryCompartmentCanonicalEditPolicy.java Sun May 23 05:36:08 2010
@@ -26,6 +26,7 @@ import java.util.Set;
 import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.CancelEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.IfEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.LogEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Param2EditPart;
@@ -79,6 +80,7 @@ public class OnEntryOnEntryCompartmentCa
 		case SendEditPart.VISUAL_ID:
 		case Param2EditPart.VISUAL_ID:
 		case Script2EditPart.VISUAL_ID:
+		case ExtenExecContentEditPart.VISUAL_ID:
 			if (!semanticChildren.contains(view.getElement())) {
 				return true;
 			}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnEntryOnEntryCompartmentItemSemanticEditPolicy.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/edit/policies/OnEntryOnEntryCompartmentItemSemanticEditPolicy.java?rev=947362&r1=947361&r2=947362&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/edit/policies/OnEntryOnEntryCompartmentItemSemanticEditPolicy.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/edit/policies/OnEntryOnEntryCompartmentItemSemanticEditPolicy.java Sun May 23 05:36:08 2010
@@ -19,6 +19,7 @@ package org.apache.commons.scxml.modelin
 import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.AssignCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.CancelCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.ExtenExecContentCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.IfCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.LogCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Param2CreateCommand;
@@ -103,6 +104,13 @@ public class OnEntryOnEntryCompartmentIt
 			}
 			return getGEFWrapper(new Script2CreateCommand(req));
 		}
+		if (ModelingElementTypes.ExtenExecContent_3049 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getOnEntry_ExecutableContext());
+			}
+			return getGEFWrapper(new ExtenExecContentCreateCommand(req));
+		}
 		return super.getCreateCommand(req);
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExit2ItemSemanticEditPolicy.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/edit/policies/OnExit2ItemSemanticEditPolicy.java?rev=947362&r1=947361&r2=947362&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/edit/policies/OnExit2ItemSemanticEditPolicy.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/edit/policies/OnExit2ItemSemanticEditPolicy.java Sun May 23 05:36:08 2010
@@ -20,6 +20,7 @@ import java.util.Iterator;
 
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.If2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Log2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitOnExitCompartment2EditPart;
@@ -98,6 +99,9 @@ public class OnExit2ItemSemanticEditPoli
 					case Script3EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
+					case ExtenExecContent2EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
 					}
 				}
 				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/edit/policies/OnExit3ItemSemanticEditPolicy.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/edit/policies/OnExit3ItemSemanticEditPolicy.java?rev=947362&r1=947361&r2=947362&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/edit/policies/OnExit3ItemSemanticEditPolicy.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/edit/policies/OnExit3ItemSemanticEditPolicy.java Sun May 23 05:36:08 2010
@@ -20,6 +20,7 @@ import java.util.Iterator;
 
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.If2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Log2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitOnExitCompartment3EditPart;
@@ -98,6 +99,9 @@ public class OnExit3ItemSemanticEditPoli
 					case Script3EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
+					case ExtenExecContent2EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
 					}
 				}
 				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/edit/policies/OnExitItemSemanticEditPolicy.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/edit/policies/OnExitItemSemanticEditPolicy.java?rev=947362&r1=947361&r2=947362&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/edit/policies/OnExitItemSemanticEditPolicy.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/edit/policies/OnExitItemSemanticEditPolicy.java Sun May 23 05:36:08 2010
@@ -20,6 +20,7 @@ import java.util.Iterator;
 
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.If2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Log2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitOnExitCompartmentEditPart;
@@ -98,6 +99,9 @@ public class OnExitItemSemanticEditPolic
 					case Script3EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
+					case ExtenExecContent2EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
 					}
 				}
 				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/edit/policies/OnExitOnExitCompartment2CanonicalEditPolicy.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/edit/policies/OnExitOnExitCompartment2CanonicalEditPolicy.java?rev=947362&r1=947361&r2=947362&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/edit/policies/OnExitOnExitCompartment2CanonicalEditPolicy.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/edit/policies/OnExitOnExitCompartment2CanonicalEditPolicy.java Sun May 23 05:36:08 2010
@@ -26,6 +26,7 @@ import java.util.Set;
 import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.If2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Log2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Param3EditPart;
@@ -79,6 +80,7 @@ public class OnExitOnExitCompartment2Can
 		case Param3EditPart.VISUAL_ID:
 		case Send2EditPart.VISUAL_ID:
 		case Script3EditPart.VISUAL_ID:
+		case ExtenExecContent2EditPart.VISUAL_ID:
 			if (!semanticChildren.contains(view.getElement())) {
 				return true;
 			}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartment2ItemSemanticEditPolicy.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/edit/policies/OnExitOnExitCompartment2ItemSemanticEditPolicy.java?rev=947362&r1=947361&r2=947362&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/edit/policies/OnExitOnExitCompartment2ItemSemanticEditPolicy.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/edit/policies/OnExitOnExitCompartment2ItemSemanticEditPolicy.java Sun May 23 05:36:08 2010
@@ -19,6 +19,7 @@ package org.apache.commons.scxml.modelin
 import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Assign2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Cancel2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.ExtenExecContent2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.If2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Log2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Param3CreateCommand;
@@ -103,6 +104,13 @@ public class OnExitOnExitCompartment2Ite
 			}
 			return getGEFWrapper(new Script3CreateCommand(req));
 		}
+		if (ModelingElementTypes.ExtenExecContent_3050 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getOnExit_ExecutableContext());
+			}
+			return getGEFWrapper(new ExtenExecContent2CreateCommand(req));
+		}
 		return super.getCreateCommand(req);
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartment3CanonicalEditPolicy.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/edit/policies/OnExitOnExitCompartment3CanonicalEditPolicy.java?rev=947362&r1=947361&r2=947362&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/edit/policies/OnExitOnExitCompartment3CanonicalEditPolicy.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/edit/policies/OnExitOnExitCompartment3CanonicalEditPolicy.java Sun May 23 05:36:08 2010
@@ -26,6 +26,7 @@ import java.util.Set;
 import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.If2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Log2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Param3EditPart;
@@ -79,6 +80,7 @@ public class OnExitOnExitCompartment3Can
 		case Param3EditPart.VISUAL_ID:
 		case Send2EditPart.VISUAL_ID:
 		case Script3EditPart.VISUAL_ID:
+		case ExtenExecContent2EditPart.VISUAL_ID:
 			if (!semanticChildren.contains(view.getElement())) {
 				return true;
 			}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartment3ItemSemanticEditPolicy.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/edit/policies/OnExitOnExitCompartment3ItemSemanticEditPolicy.java?rev=947362&r1=947361&r2=947362&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/edit/policies/OnExitOnExitCompartment3ItemSemanticEditPolicy.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/edit/policies/OnExitOnExitCompartment3ItemSemanticEditPolicy.java Sun May 23 05:36:08 2010
@@ -19,6 +19,7 @@ package org.apache.commons.scxml.modelin
 import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Assign2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Cancel2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.ExtenExecContent2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.If2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Log2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Param3CreateCommand;
@@ -103,6 +104,13 @@ public class OnExitOnExitCompartment3Ite
 			}
 			return getGEFWrapper(new Script3CreateCommand(req));
 		}
+		if (ModelingElementTypes.ExtenExecContent_3050 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getOnExit_ExecutableContext());
+			}
+			return getGEFWrapper(new ExtenExecContent2CreateCommand(req));
+		}
 		return super.getCreateCommand(req);
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartmentCanonicalEditPolicy.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/edit/policies/OnExitOnExitCompartmentCanonicalEditPolicy.java?rev=947362&r1=947361&r2=947362&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/edit/policies/OnExitOnExitCompartmentCanonicalEditPolicy.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/edit/policies/OnExitOnExitCompartmentCanonicalEditPolicy.java Sun May 23 05:36:08 2010
@@ -26,6 +26,7 @@ import java.util.Set;
 import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.If2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Log2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Param3EditPart;
@@ -79,6 +80,7 @@ public class OnExitOnExitCompartmentCano
 		case Param3EditPart.VISUAL_ID:
 		case Send2EditPart.VISUAL_ID:
 		case Script3EditPart.VISUAL_ID:
+		case ExtenExecContent2EditPart.VISUAL_ID:
 			if (!semanticChildren.contains(view.getElement())) {
 				return true;
 			}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartmentItemSemanticEditPolicy.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/edit/policies/OnExitOnExitCompartmentItemSemanticEditPolicy.java?rev=947362&r1=947361&r2=947362&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/edit/policies/OnExitOnExitCompartmentItemSemanticEditPolicy.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/edit/policies/OnExitOnExitCompartmentItemSemanticEditPolicy.java Sun May 23 05:36:08 2010
@@ -19,6 +19,7 @@ package org.apache.commons.scxml.modelin
 import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Assign2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Cancel2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.ExtenExecContent2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.If2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Log2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Param3CreateCommand;
@@ -103,6 +104,13 @@ public class OnExitOnExitCompartmentItem
 			}
 			return getGEFWrapper(new Script3CreateCommand(req));
 		}
+		if (ModelingElementTypes.ExtenExecContent_3050 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getOnExit_ExecutableContext());
+			}
+			return getGEFWrapper(new ExtenExecContent2CreateCommand(req));
+		}
 		return super.getCreateCommand(req);
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ServiceTemplateCanonicalEditPolicy.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/edit/policies/ServiceTemplateCanonicalEditPolicy.java?rev=947362&r1=947361&r2=947362&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/edit/policies/ServiceTemplateCanonicalEditPolicy.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/edit/policies/ServiceTemplateCanonicalEditPolicy.java Sun May 23 05:36:08 2010
@@ -43,6 +43,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.DonedataEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ElseEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ElseIfEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeEditPart;
@@ -533,6 +535,17 @@ public class ServiceTemplateCanonicalEdi
 			}
 			break;
 		}
+		case ExtenExecContentEditPart.VISUAL_ID: {
+			if (!domain2NotationMap.containsKey(view.getElement())) {
+				result.addAll(ModelingDiagramUpdater
+						.getExtenExecContent_3049ContainedLinks(view));
+			}
+			if (!domain2NotationMap.containsKey(view.getElement())
+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$
+				domain2NotationMap.put(view.getElement(), view);
+			}
+			break;
+		}
 		case OnExitEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
 				result.addAll(ModelingDiagramUpdater
@@ -643,6 +656,17 @@ public class ServiceTemplateCanonicalEdi
 			}
 			break;
 		}
+		case ExtenExecContent2EditPart.VISUAL_ID: {
+			if (!domain2NotationMap.containsKey(view.getElement())) {
+				result.addAll(ModelingDiagramUpdater
+						.getExtenExecContent_3050ContainedLinks(view));
+			}
+			if (!domain2NotationMap.containsKey(view.getElement())
+					|| view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$
+				domain2NotationMap.put(view.getElement(), view);
+			}
+			break;
+		}
 		case InvokeEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
 				result.addAll(ModelingDiagramUpdater

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ModelingNavigatorContentProvider.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/navigator/ModelingNavigatorContentProvider.java?rev=947362&r1=947361&r2=947362&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/navigator/ModelingNavigatorContentProvider.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/navigator/ModelingNavigatorContentProvider.java Sun May 23 05:36:08 2010
@@ -46,6 +46,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.DonedataEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ElseEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ElseIfEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateFinalStateCompartment2EditPart;
@@ -627,6 +629,12 @@ public class ModelingNavigatorContentPro
 					Script2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					OnEntryOnEntryCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ExtenExecContentEditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
 			return result.toArray();
 		}
 
@@ -744,6 +752,12 @@ public class ModelingNavigatorContentPro
 					Script3EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					OnExitOnExitCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ExtenExecContent2EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
 			return result.toArray();
 		}
 
@@ -1072,6 +1086,12 @@ public class ModelingNavigatorContentPro
 					Script2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					OnEntryOnEntryCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ExtenExecContentEditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
 			return result.toArray();
 		}
 
@@ -1132,6 +1152,12 @@ public class ModelingNavigatorContentPro
 					Script3EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					OnExitOnExitCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ExtenExecContent2EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
 			return result.toArray();
 		}
 
@@ -1345,6 +1371,12 @@ public class ModelingNavigatorContentPro
 					Script2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					OnEntryOnEntryCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ExtenExecContentEditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
 			return result.toArray();
 		}
 
@@ -1405,6 +1437,12 @@ public class ModelingNavigatorContentPro
 					Script3EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					OnExitOnExitCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ExtenExecContent2EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
 			return result.toArray();
 		}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ModelingNavigatorLabelProvider.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/navigator/ModelingNavigatorLabelProvider.java?rev=947362&r1=947361&r2=947362&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/navigator/ModelingNavigatorLabelProvider.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/navigator/ModelingNavigatorLabelProvider.java Sun May 23 05:36:08 2010
@@ -166,6 +166,9 @@ public class ModelingNavigatorLabelProvi
 		case Script2EditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?Script", ModelingElementTypes.Script_3015); //$NON-NLS-1$
+		case ExtenExecContentEditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?ExtenExecContent", ModelingElementTypes.ExtenExecContent_3049); //$NON-NLS-1$
 		case OnExitEditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?OnExit", ModelingElementTypes.OnExit_3016); //$NON-NLS-1$
@@ -196,6 +199,9 @@ public class ModelingNavigatorLabelProvi
 		case Script3EditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?Script", ModelingElementTypes.Script_3025); //$NON-NLS-1$
+		case ExtenExecContent2EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?ExtenExecContent", ModelingElementTypes.ExtenExecContent_3050); //$NON-NLS-1$
 		case InvokeEditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?Invoke", ModelingElementTypes.Invoke_3026); //$NON-NLS-1$
@@ -364,6 +370,8 @@ public class ModelingNavigatorLabelProvi
 			return getParam_3014Text(view);
 		case Script2EditPart.VISUAL_ID:
 			return getScript_3015Text(view);
+		case ExtenExecContentEditPart.VISUAL_ID:
+			return getExtenExecContent_3049Text(view);
 		case OnExitEditPart.VISUAL_ID:
 			return getOnExit_3016Text(view);
 		case If2EditPart.VISUAL_ID:
@@ -384,6 +392,8 @@ public class ModelingNavigatorLabelProvi
 			return getSend_3024Text(view);
 		case Script3EditPart.VISUAL_ID:
 			return getScript_3025Text(view);
+		case ExtenExecContent2EditPart.VISUAL_ID:
+			return getExtenExecContent_3050Text(view);
 		case InvokeEditPart.VISUAL_ID:
 			return getInvoke_3026Text(view);
 		case FinalizeEditPart.VISUAL_ID:
@@ -867,6 +877,26 @@ public class ModelingNavigatorLabelProvi
 	/**
 	 * @generated
 	 */
+	private String getExtenExecContent_3049Text(View view) {
+
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.ExtenExecContent_3049,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry
+						.getType(WrappingLabel15EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
 	private String getOnExit_3016Text(View view) {
 
 		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
@@ -1078,6 +1108,26 @@ public class ModelingNavigatorLabelProvi
 	/**
 	 * @generated
 	 */
+	private String getExtenExecContent_3050Text(View view) {
+
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.ExtenExecContent_3050,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry
+						.getType(WrappingLabel16EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
 	private String getInvoke_3026Text(View view) {
 		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
 				ModelingElementTypes.Invoke_3026,

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/ModelingDiagramUpdater.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/ModelingDiagramUpdater.java?rev=947362&r1=947361&r2=947362&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/ModelingDiagramUpdater.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/ModelingDiagramUpdater.java Sun May 23 05:36:08 2010
@@ -72,6 +72,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.DonedataEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ElseEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ElseIfEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateFinalStateCompartment2EditPart;
@@ -353,6 +355,10 @@ public class ModelingDiagramUpdater {
 				result.add(new ModelingNodeDescriptor(childElement, visualID));
 				continue;
 			}
+			if (visualID == ExtenExecContentEditPart.VISUAL_ID) {
+				result.add(new ModelingNodeDescriptor(childElement, visualID));
+				continue;
+			}
 		}
 		{
 			Script childElement = modelElement.getScript();
@@ -533,6 +539,10 @@ public class ModelingDiagramUpdater {
 				result.add(new ModelingNodeDescriptor(childElement, visualID));
 				continue;
 			}
+			if (visualID == ExtenExecContent2EditPart.VISUAL_ID) {
+				result.add(new ModelingNodeDescriptor(childElement, visualID));
+				continue;
+			}
 		}
 		{
 			Script childElement = modelElement.getScript();
@@ -869,6 +879,10 @@ public class ModelingDiagramUpdater {
 				result.add(new ModelingNodeDescriptor(childElement, visualID));
 				continue;
 			}
+			if (visualID == ExtenExecContentEditPart.VISUAL_ID) {
+				result.add(new ModelingNodeDescriptor(childElement, visualID));
+				continue;
+			}
 		}
 		{
 			Script childElement = modelElement.getScript();
@@ -931,6 +945,10 @@ public class ModelingDiagramUpdater {
 				result.add(new ModelingNodeDescriptor(childElement, visualID));
 				continue;
 			}
+			if (visualID == ExtenExecContent2EditPart.VISUAL_ID) {
+				result.add(new ModelingNodeDescriptor(childElement, visualID));
+				continue;
+			}
 		}
 		{
 			Script childElement = modelElement.getScript();
@@ -1190,6 +1208,10 @@ public class ModelingDiagramUpdater {
 				result.add(new ModelingNodeDescriptor(childElement, visualID));
 				continue;
 			}
+			if (visualID == ExtenExecContentEditPart.VISUAL_ID) {
+				result.add(new ModelingNodeDescriptor(childElement, visualID));
+				continue;
+			}
 		}
 		{
 			Script childElement = modelElement.getScript();
@@ -1252,6 +1274,10 @@ public class ModelingDiagramUpdater {
 				result.add(new ModelingNodeDescriptor(childElement, visualID));
 				continue;
 			}
+			if (visualID == ExtenExecContent2EditPart.VISUAL_ID) {
+				result.add(new ModelingNodeDescriptor(childElement, visualID));
+				continue;
+			}
 		}
 		{
 			Script childElement = modelElement.getScript();
@@ -1660,6 +1686,8 @@ public class ModelingDiagramUpdater {
 			return getParam_3014ContainedLinks(view);
 		case Script2EditPart.VISUAL_ID:
 			return getScript_3015ContainedLinks(view);
+		case ExtenExecContentEditPart.VISUAL_ID:
+			return getExtenExecContent_3049ContainedLinks(view);
 		case OnExitEditPart.VISUAL_ID:
 			return getOnExit_3016ContainedLinks(view);
 		case If2EditPart.VISUAL_ID:
@@ -1680,6 +1708,8 @@ public class ModelingDiagramUpdater {
 			return getSend_3024ContainedLinks(view);
 		case Script3EditPart.VISUAL_ID:
 			return getScript_3025ContainedLinks(view);
+		case ExtenExecContent2EditPart.VISUAL_ID:
+			return getExtenExecContent_3050ContainedLinks(view);
 		case InvokeEditPart.VISUAL_ID:
 			return getInvoke_3026ContainedLinks(view);
 		case FinalizeEditPart.VISUAL_ID:
@@ -1779,6 +1809,8 @@ public class ModelingDiagramUpdater {
 			return getParam_3014IncomingLinks(view);
 		case Script2EditPart.VISUAL_ID:
 			return getScript_3015IncomingLinks(view);
+		case ExtenExecContentEditPart.VISUAL_ID:
+			return getExtenExecContent_3049IncomingLinks(view);
 		case OnExitEditPart.VISUAL_ID:
 			return getOnExit_3016IncomingLinks(view);
 		case If2EditPart.VISUAL_ID:
@@ -1799,6 +1831,8 @@ public class ModelingDiagramUpdater {
 			return getSend_3024IncomingLinks(view);
 		case Script3EditPart.VISUAL_ID:
 			return getScript_3025IncomingLinks(view);
+		case ExtenExecContent2EditPart.VISUAL_ID:
+			return getExtenExecContent_3050IncomingLinks(view);
 		case InvokeEditPart.VISUAL_ID:
 			return getInvoke_3026IncomingLinks(view);
 		case FinalizeEditPart.VISUAL_ID:
@@ -1898,6 +1932,8 @@ public class ModelingDiagramUpdater {
 			return getParam_3014OutgoingLinks(view);
 		case Script2EditPart.VISUAL_ID:
 			return getScript_3015OutgoingLinks(view);
+		case ExtenExecContentEditPart.VISUAL_ID:
+			return getExtenExecContent_3049OutgoingLinks(view);
 		case OnExitEditPart.VISUAL_ID:
 			return getOnExit_3016OutgoingLinks(view);
 		case If2EditPart.VISUAL_ID:
@@ -1918,6 +1954,8 @@ public class ModelingDiagramUpdater {
 			return getSend_3024OutgoingLinks(view);
 		case Script3EditPart.VISUAL_ID:
 			return getScript_3025OutgoingLinks(view);
+		case ExtenExecContent2EditPart.VISUAL_ID:
+			return getExtenExecContent_3050OutgoingLinks(view);
 		case InvokeEditPart.VISUAL_ID:
 			return getInvoke_3026OutgoingLinks(view);
 		case FinalizeEditPart.VISUAL_ID:
@@ -2143,6 +2181,13 @@ public class ModelingDiagramUpdater {
 	/**
 	 * @generated
 	 */
+	public static List getExtenExecContent_3049ContainedLinks(View view) {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
 	public static List getOnExit_3016ContainedLinks(View view) {
 		return Collections.EMPTY_LIST;
 	}
@@ -2213,6 +2258,13 @@ public class ModelingDiagramUpdater {
 	/**
 	 * @generated
 	 */
+	public static List getExtenExecContent_3050ContainedLinks(View view) {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
 	public static List getInvoke_3026ContainedLinks(View view) {
 		return Collections.EMPTY_LIST;
 	}
@@ -2584,6 +2636,13 @@ public class ModelingDiagramUpdater {
 	/**
 	 * @generated
 	 */
+	public static List getExtenExecContent_3049IncomingLinks(View view) {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
 	public static List getOnExit_3016IncomingLinks(View view) {
 		return Collections.EMPTY_LIST;
 	}
@@ -2654,6 +2713,13 @@ public class ModelingDiagramUpdater {
 	/**
 	 * @generated
 	 */
+	public static List getExtenExecContent_3050IncomingLinks(View view) {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
 	public static List getInvoke_3026IncomingLinks(View view) {
 		return Collections.EMPTY_LIST;
 	}
@@ -3033,6 +3099,13 @@ public class ModelingDiagramUpdater {
 	/**
 	 * @generated
 	 */
+	public static List getExtenExecContent_3049OutgoingLinks(View view) {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
 	public static List getOnExit_3016OutgoingLinks(View view) {
 		return Collections.EMPTY_LIST;
 	}
@@ -3103,6 +3176,13 @@ public class ModelingDiagramUpdater {
 	/**
 	 * @generated
 	 */
+	public static List getExtenExecContent_3050OutgoingLinks(View view) {
+		return Collections.EMPTY_LIST;
+	}
+
+	/**
+	 * @generated
+	 */
 	public static List getInvoke_3026OutgoingLinks(View view) {
 		return Collections.EMPTY_LIST;
 	}

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/ModelingPaletteFactory.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/ModelingPaletteFactory.java?rev=947362&r1=947361&r2=947362&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/ModelingPaletteFactory.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/ModelingPaletteFactory.java Sun May 23 05:36:08 2010
@@ -235,10 +235,16 @@ public class ModelingPaletteFactory {
 	 * @generated
 	 */
 	private ToolEntry createExtenExecContent9CreationTool() {
-		ToolEntry entry = new ToolEntry(
+		List/*<IElementType>*/types = new ArrayList/*<IElementType>*/(2);
+		types.add(ModelingElementTypes.ExtenExecContent_3049);
+		types.add(ModelingElementTypes.ExtenExecContent_3050);
+		NodeToolEntry entry = new NodeToolEntry(
 				Messages.ExtenExecContent9CreationTool_title,
-				Messages.ExtenExecContent9CreationTool_desc, null, null) {
-		};
+				Messages.ExtenExecContent9CreationTool_desc, types);
+		entry
+				.setSmallIcon(ModelingElementTypes
+						.getImageDescriptor(ModelingElementTypes.ExtenExecContent_3049));
+		entry.setLargeIcon(entry.getSmallIcon());
 		return entry;
 	}
 

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=947362&r1=947361&r2=947362&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 Sun May 23 05:36:08 2010
@@ -207,6 +207,10 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return Script2EditPart.VISUAL_ID;
 			}
+			if (ModelingPackage.eINSTANCE.getExtenExecContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ExtenExecContentEditPart.VISUAL_ID;
+			}
 			break;
 		case IfIfCompartmentEditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getElseIf().isSuperTypeOf(
@@ -277,6 +281,10 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return Script3EditPart.VISUAL_ID;
 			}
+			if (ModelingPackage.eINSTANCE.getExtenExecContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ExtenExecContent2EditPart.VISUAL_ID;
+			}
 			break;
 		case IfIfCompartment2EditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getElseIf().isSuperTypeOf(
@@ -407,6 +415,10 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return Script2EditPart.VISUAL_ID;
 			}
+			if (ModelingPackage.eINSTANCE.getExtenExecContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ExtenExecContentEditPart.VISUAL_ID;
+			}
 			break;
 		case OnExitOnExitCompartment2EditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getIf().isSuperTypeOf(
@@ -445,6 +457,10 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return Script3EditPart.VISUAL_ID;
 			}
+			if (ModelingPackage.eINSTANCE.getExtenExecContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ExtenExecContent2EditPart.VISUAL_ID;
+			}
 			break;
 		case StateStateCompartment2EditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getOnEntry().isSuperTypeOf(
@@ -551,6 +567,10 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return Script2EditPart.VISUAL_ID;
 			}
+			if (ModelingPackage.eINSTANCE.getExtenExecContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ExtenExecContentEditPart.VISUAL_ID;
+			}
 			break;
 		case OnExitOnExitCompartment3EditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getIf().isSuperTypeOf(
@@ -589,6 +609,10 @@ public class ModelingVisualIDRegistry {
 					domainElement.eClass())) {
 				return Script3EditPart.VISUAL_ID;
 			}
+			if (ModelingPackage.eINSTANCE.getExtenExecContent().isSuperTypeOf(
+					domainElement.eClass())) {
+				return ExtenExecContent2EditPart.VISUAL_ID;
+			}
 			break;
 		case StateStateCompartment3EditPart.VISUAL_ID:
 			if (ModelingPackage.eINSTANCE.getOnEntry().isSuperTypeOf(
@@ -863,6 +887,11 @@ public class ModelingVisualIDRegistry {
 				return true;
 			}
 			break;
+		case ExtenExecContentEditPart.VISUAL_ID:
+			if (WrappingLabel15EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
 		case OnExitEditPart.VISUAL_ID:
 			if (WrappingLabel6EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
@@ -922,6 +951,11 @@ public class ModelingVisualIDRegistry {
 				return true;
 			}
 			break;
+		case ExtenExecContent2EditPart.VISUAL_ID:
+			if (WrappingLabel16EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
+			break;
 		case InvokeEditPart.VISUAL_ID:
 			if (InvokeTypeEditPart.VISUAL_ID == nodeVisualID) {
 				return true;
@@ -1130,6 +1164,9 @@ public class ModelingVisualIDRegistry {
 			if (Script2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if (ExtenExecContentEditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case IfIfCompartmentEditPart.VISUAL_ID:
 			if (ElseIfEditPart.VISUAL_ID == nodeVisualID) {
@@ -1185,6 +1222,9 @@ public class ModelingVisualIDRegistry {
 			if (Script3EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if (ExtenExecContent2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case IfIfCompartment2EditPart.VISUAL_ID:
 			if (ElseIfEditPart.VISUAL_ID == nodeVisualID) {
@@ -1286,6 +1326,9 @@ public class ModelingVisualIDRegistry {
 			if (Script2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if (ExtenExecContentEditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case OnExitOnExitCompartment2EditPart.VISUAL_ID:
 			if (If2EditPart.VISUAL_ID == nodeVisualID) {
@@ -1315,6 +1358,9 @@ public class ModelingVisualIDRegistry {
 			if (Script3EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if (ExtenExecContent2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case StateStateCompartment2EditPart.VISUAL_ID:
 			if (OnEntryEditPart.VISUAL_ID == nodeVisualID) {
@@ -1397,6 +1443,9 @@ public class ModelingVisualIDRegistry {
 			if (Script2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if (ExtenExecContentEditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case OnExitOnExitCompartment3EditPart.VISUAL_ID:
 			if (If2EditPart.VISUAL_ID == nodeVisualID) {
@@ -1426,6 +1475,9 @@ public class ModelingVisualIDRegistry {
 			if (Script3EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
+			if (ExtenExecContent2EditPart.VISUAL_ID == nodeVisualID) {
+				return true;
+			}
 			break;
 		case StateStateCompartment3EditPart.VISUAL_ID:
 			if (OnEntryEditPart.VISUAL_ID == nodeVisualID) {

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=947362&r1=947361&r2=947362&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 Sun May 23 05:36:08 2010
@@ -151,6 +151,11 @@ public class ModelingElementTypes extend
 	/**
 	 * @generated
 	 */
+	public static final IElementType ExtenExecContent_3049 = getElementType("org.apache.commons.scxml.modeling.diagram.ExtenExecContent_3049"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
 	public static final IElementType OnExit_3016 = getElementType("org.apache.commons.scxml.modeling.diagram.OnExit_3016"); //$NON-NLS-1$
 	/**
 	 * @generated
@@ -191,6 +196,11 @@ public class ModelingElementTypes extend
 	/**
 	 * @generated
 	 */
+	public static final IElementType ExtenExecContent_3050 = getElementType("org.apache.commons.scxml.modeling.diagram.ExtenExecContent_3050"); //$NON-NLS-1$
+
+	/**
+	 * @generated
+	 */
 	public static final IElementType Invoke_3026 = getElementType("org.apache.commons.scxml.modeling.diagram.Invoke_3026"); //$NON-NLS-1$
 	/**
 	 * @generated
@@ -446,6 +456,9 @@ public class ModelingElementTypes extend
 
 			elements.put(Script_3015, ModelingPackage.eINSTANCE.getScript());
 
+			elements.put(ExtenExecContent_3049, ModelingPackage.eINSTANCE
+					.getExtenExecContent());
+
 			elements.put(OnExit_3016, ModelingPackage.eINSTANCE.getOnExit());
 
 			elements.put(If_3017, ModelingPackage.eINSTANCE.getIf());
@@ -467,6 +480,9 @@ public class ModelingElementTypes extend
 
 			elements.put(Script_3025, ModelingPackage.eINSTANCE.getScript());
 
+			elements.put(ExtenExecContent_3050, ModelingPackage.eINSTANCE
+					.getExtenExecContent());
+
 			elements.put(Invoke_3026, ModelingPackage.eINSTANCE.getInvoke());
 
 			elements
@@ -562,6 +578,7 @@ public class ModelingElementTypes extend
 			KNOWN_ELEMENT_TYPES.add(Content_3013);
 			KNOWN_ELEMENT_TYPES.add(Param_3014);
 			KNOWN_ELEMENT_TYPES.add(Script_3015);
+			KNOWN_ELEMENT_TYPES.add(ExtenExecContent_3049);
 			KNOWN_ELEMENT_TYPES.add(OnExit_3016);
 			KNOWN_ELEMENT_TYPES.add(If_3017);
 			KNOWN_ELEMENT_TYPES.add(Assign_3018);
@@ -572,6 +589,7 @@ public class ModelingElementTypes extend
 			KNOWN_ELEMENT_TYPES.add(Param_3023);
 			KNOWN_ELEMENT_TYPES.add(Send_3024);
 			KNOWN_ELEMENT_TYPES.add(Script_3025);
+			KNOWN_ELEMENT_TYPES.add(ExtenExecContent_3050);
 			KNOWN_ELEMENT_TYPES.add(Invoke_3026);
 			KNOWN_ELEMENT_TYPES.add(Finalize_3027);
 			KNOWN_ELEMENT_TYPES.add(Param_3028);

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=947362&r1=947361&r2=947362&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 Sun May 23 05:36:08 2010
@@ -115,6 +115,7 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.Send_3010);
 			types.add(ModelingElementTypes.Param_3014);
 			types.add(ModelingElementTypes.Script_3015);
+			types.add(ModelingElementTypes.ExtenExecContent_3049);
 			return types;
 		}
 		if (editPart instanceof SendSendCompartmentEditPart) {
@@ -144,6 +145,7 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.Param_3023);
 			types.add(ModelingElementTypes.Send_3024);
 			types.add(ModelingElementTypes.Script_3025);
+			types.add(ModelingElementTypes.ExtenExecContent_3050);
 			return types;
 		}
 		if (editPart instanceof SendSendCompartment2EditPart) {
@@ -195,6 +197,7 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.Send_3010);
 			types.add(ModelingElementTypes.Param_3014);
 			types.add(ModelingElementTypes.Script_3015);
+			types.add(ModelingElementTypes.ExtenExecContent_3049);
 			return types;
 		}
 		if (editPart instanceof OnExitOnExitCompartment2EditPart) {
@@ -208,6 +211,7 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.Param_3023);
 			types.add(ModelingElementTypes.Send_3024);
 			types.add(ModelingElementTypes.Script_3025);
+			types.add(ModelingElementTypes.ExtenExecContent_3050);
 			return types;
 		}
 		if (editPart instanceof StateStateCompartment2EditPart) {
@@ -252,6 +256,7 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.Send_3010);
 			types.add(ModelingElementTypes.Param_3014);
 			types.add(ModelingElementTypes.Script_3015);
+			types.add(ModelingElementTypes.ExtenExecContent_3049);
 			return types;
 		}
 		if (editPart instanceof OnExitOnExitCompartment3EditPart) {
@@ -265,6 +270,7 @@ public class ModelingModelingAssistantPr
 			types.add(ModelingElementTypes.Param_3023);
 			types.add(ModelingElementTypes.Send_3024);
 			types.add(ModelingElementTypes.Script_3025);
+			types.add(ModelingElementTypes.ExtenExecContent_3050);
 			return types;
 		}
 		if (editPart instanceof StateStateCompartment3EditPart) {

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/ModelingViewProvider.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/ModelingViewProvider.java?rev=947362&r1=947361&r2=947362&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/ModelingViewProvider.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/ModelingViewProvider.java Sun May 23 05:36:08 2010
@@ -111,6 +111,7 @@ public class ModelingViewProvider extend
 				case ParamEditPart.VISUAL_ID:
 				case ContentEditPart.VISUAL_ID:
 				case Script2EditPart.VISUAL_ID:
+				case ExtenExecContentEditPart.VISUAL_ID:
 				case OnExitEditPart.VISUAL_ID:
 				case InvokeEditPart.VISUAL_ID:
 				case FinalizeEditPart.VISUAL_ID:
@@ -136,6 +137,7 @@ public class ModelingViewProvider extend
 				case Param3EditPart.VISUAL_ID:
 				case Send2EditPart.VISUAL_ID:
 				case Script3EditPart.VISUAL_ID:
+				case ExtenExecContent2EditPart.VISUAL_ID:
 				case Param4EditPart.VISUAL_ID:
 				case Content3EditPart.VISUAL_ID:
 				case HistoryState2EditPart.VISUAL_ID:
@@ -311,6 +313,13 @@ public class ModelingViewProvider extend
 						return null; // wrong container
 					}
 					break;
+				case WrappingLabel15EditPart.VISUAL_ID:
+					if (ExtenExecContentEditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
 				case WrappingLabel6EditPart.VISUAL_ID:
 				case OnExitOnExitCompartmentEditPart.VISUAL_ID:
 					if (OnExitEditPart.VISUAL_ID != ModelingVisualIDRegistry
@@ -384,6 +393,13 @@ public class ModelingViewProvider extend
 						return null; // wrong container
 					}
 					break;
+				case WrappingLabel16EditPart.VISUAL_ID:
+					if (ExtenExecContent2EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
 				case InvokeTypeEditPart.VISUAL_ID:
 				case InvokeInvokeCompartmentEditPart.VISUAL_ID:
 					if (InvokeEditPart.VISUAL_ID != ModelingVisualIDRegistry
@@ -662,6 +678,10 @@ public class ModelingViewProvider extend
 			return Script2ViewFactory.class;
 		case WrappingLabel5EditPart.VISUAL_ID:
 			return WrappingLabel5ViewFactory.class;
+		case ExtenExecContentEditPart.VISUAL_ID:
+			return ExtenExecContentViewFactory.class;
+		case WrappingLabel15EditPart.VISUAL_ID:
+			return WrappingLabel15ViewFactory.class;
 		case OnExitEditPart.VISUAL_ID:
 			return OnExitViewFactory.class;
 		case WrappingLabel6EditPart.VISUAL_ID:
@@ -702,6 +722,10 @@ public class ModelingViewProvider extend
 			return Script3ViewFactory.class;
 		case WrappingLabel7EditPart.VISUAL_ID:
 			return WrappingLabel7ViewFactory.class;
+		case ExtenExecContent2EditPart.VISUAL_ID:
+			return ExtenExecContent2ViewFactory.class;
+		case WrappingLabel16EditPart.VISUAL_ID:
+			return WrappingLabel16ViewFactory.class;
 		case InvokeEditPart.VISUAL_ID:
 			return InvokeViewFactory.class;
 		case InvokeTypeEditPart.VISUAL_ID:

Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ExtenExecContent2ViewFactory.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/view/factories/ExtenExecContent2ViewFactory.java?rev=947362&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ExtenExecContent2ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ExtenExecContent2ViewFactory.java Sun May 23 05:36:08 2010
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.scxml.modeling.diagram.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.WrappingLabel16EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class ExtenExecContent2ViewFactory extends AbstractShapeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createShapeStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(ExtenExecContent2EditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		IAdaptable eObjectAdapter = null;
+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
+			eObjectAdapter = new EObjectAdapter(eObject);
+		}
+		getViewService().createNode(
+				eObjectAdapter,
+				view,
+				ModelingVisualIDRegistry
+						.getType(WrappingLabel16EditPart.VISUAL_ID),
+				ViewUtil.APPEND, true, getPreferencesHint());
+	}
+}

Propchange: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ExtenExecContent2ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ExtenExecContentViewFactory.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/view/factories/ExtenExecContentViewFactory.java?rev=947362&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ExtenExecContentViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ExtenExecContentViewFactory.java Sun May 23 05:36:08 2010
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.scxml.modeling.diagram.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.WrappingLabel15EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class ExtenExecContentViewFactory extends AbstractShapeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createShapeStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(ExtenExecContentEditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		IAdaptable eObjectAdapter = null;
+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
+			eObjectAdapter = new EObjectAdapter(eObject);
+		}
+		getViewService().createNode(
+				eObjectAdapter,
+				view,
+				ModelingVisualIDRegistry
+						.getType(WrappingLabel15EditPart.VISUAL_ID),
+				ViewUtil.APPEND, true, getPreferencesHint());
+	}
+}

Propchange: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ExtenExecContentViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/WrappingLabel15ViewFactory.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/view/factories/WrappingLabel15ViewFactory.java?rev=947362&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/WrappingLabel15ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/WrappingLabel15ViewFactory.java Sun May 23 05:36:08 2010
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.scxml.modeling.diagram.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class WrappingLabel15ViewFactory extends BasicNodeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		return styles;
+	}
+}

Propchange: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/WrappingLabel15ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/WrappingLabel16ViewFactory.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/view/factories/WrappingLabel16ViewFactory.java?rev=947362&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/WrappingLabel16ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/WrappingLabel16ViewFactory.java Sun May 23 05:36:08 2010
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.scxml.modeling.diagram.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class WrappingLabel16ViewFactory extends BasicNodeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		return styles;
+	}
+}

Propchange: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/WrappingLabel16ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message