commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gu...@apache.org
Subject svn commit: r960911 [8/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
Propchange: 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/Finalize2ItemSemanticEditPolicy.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/edit/policies/Finalize3ItemSemanticEditPolicy.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/Finalize3ItemSemanticEditPolicy.java?rev=960911&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/edit/policies/Finalize3ItemSemanticEditPolicy.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/edit/policies/Finalize3ItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,112 @@
+/*
+ * 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.edit.policies;
+
+import java.util.Iterator;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeFinalizeCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.If3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Log3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Param7EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Raise3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Script4EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Send3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Validate3EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class Finalize3ItemSemanticEditPolicy extends
+		ModelingBaseItemSemanticEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	protected Command getDestroyElementCommand(DestroyElementRequest req) {
+		CompoundCommand cc = getDestroyEdgesCommand();
+		addDestroyChildNodesCommand(cc);
+		addDestroyShortcutsCommand(cc);
+		cc.add(getGEFWrapper(new DestroyElementCommand(req)));
+		return cc.unwrap();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void addDestroyChildNodesCommand(CompoundCommand cmd) {
+		View view = (View) getHost().getModel();
+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
+		if (annotation != null) {
+			return;
+		}
+		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
+			Node node = (Node) it.next();
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
+			case FinalizeFinalizeCompartment3EditPart.VISUAL_ID:
+				for (Iterator cit = node.getChildren().iterator(); cit
+						.hasNext();) {
+					Node cnode = (Node) cit.next();
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
+					case If3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Assign3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Raise3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Log3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Validate3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Cancel3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Send3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Param7EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Script4EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case ExtenExecContent3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					}
+				}
+				break;
+			}
+		}
+	}
+
+}

Propchange: 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/Finalize3ItemSemanticEditPolicy.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/edit/policies/FinalizeFinalizeCompartment2CanonicalEditPolicy.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/FinalizeFinalizeCompartment2CanonicalEditPolicy.java?rev=960911&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/edit/policies/FinalizeFinalizeCompartment2CanonicalEditPolicy.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/edit/policies/FinalizeFinalizeCompartment2CanonicalEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,110 @@
+/*
+ * 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.edit.policies;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.scxml.modeling.ModelingPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.If3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Log3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Param7EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Raise3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Script4EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Send3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Validate3EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingDiagramUpdater;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingNodeDescriptor;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class FinalizeFinalizeCompartment2CanonicalEditPolicy extends
+		CanonicalEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	Set myFeaturesToSynchronize;
+
+	/**
+	 * @generated
+	 */
+	protected List getSemanticChildrenList() {
+		View viewObject = (View) getHost().getModel();
+		List result = new LinkedList();
+		for (Iterator it = ModelingDiagramUpdater
+				.getFinalizeFinalizeCompartment_7036SemanticChildren(viewObject)
+				.iterator(); it.hasNext();) {
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
+		}
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isOrphaned(Collection semanticChildren, final View view) {
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
+		switch (visualID) {
+		case If3EditPart.VISUAL_ID:
+		case Assign3EditPart.VISUAL_ID:
+		case Raise3EditPart.VISUAL_ID:
+		case Log3EditPart.VISUAL_ID:
+		case Validate3EditPart.VISUAL_ID:
+		case Cancel3EditPart.VISUAL_ID:
+		case Send3EditPart.VISUAL_ID:
+		case Param7EditPart.VISUAL_ID:
+		case Script4EditPart.VISUAL_ID:
+		case ExtenExecContent3EditPart.VISUAL_ID:
+			if (!semanticChildren.contains(view.getElement())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getDefaultFactoryHint() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Set getFeaturesToSynchronize() {
+		if (myFeaturesToSynchronize == null) {
+			myFeaturesToSynchronize = new HashSet();
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getFinalize_ExecutableContent());
+		}
+		return myFeaturesToSynchronize;
+	}
+
+}

Propchange: 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/FinalizeFinalizeCompartment2CanonicalEditPolicy.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/edit/policies/FinalizeFinalizeCompartment2ItemSemanticEditPolicy.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/FinalizeFinalizeCompartment2ItemSemanticEditPolicy.java?rev=960911&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/edit/policies/FinalizeFinalizeCompartment2ItemSemanticEditPolicy.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/edit/policies/FinalizeFinalizeCompartment2ItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,117 @@
+/*
+ * 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.edit.policies;
+
+import org.apache.commons.scxml.modeling.ModelingPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Assign3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Cancel3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.ExtenExecContent3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.If3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Log3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Param7CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Raise3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Script4CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Send3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Validate3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+
+/**
+ * @generated
+ */
+public class FinalizeFinalizeCompartment2ItemSemanticEditPolicy extends
+		ModelingBaseItemSemanticEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	protected Command getCreateCommand(CreateElementRequest req) {
+		if (ModelingElementTypes.If_3053 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new If3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Assign_3054 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Assign3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Raise_3055 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Raise3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Log_3056 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Log3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Validate_3057 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Validate3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Cancel_3058 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Cancel3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Send_3059 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Send3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Param_3060 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Param7CreateCommand(req));
+		}
+		if (ModelingElementTypes.Script_3061 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Script4CreateCommand(req));
+		}
+		if (ModelingElementTypes.ExtenExecContent_3062 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new ExtenExecContent3CreateCommand(req));
+		}
+		return super.getCreateCommand(req);
+	}
+
+}

Propchange: 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/FinalizeFinalizeCompartment2ItemSemanticEditPolicy.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/edit/policies/FinalizeFinalizeCompartment3CanonicalEditPolicy.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/FinalizeFinalizeCompartment3CanonicalEditPolicy.java?rev=960911&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/edit/policies/FinalizeFinalizeCompartment3CanonicalEditPolicy.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/edit/policies/FinalizeFinalizeCompartment3CanonicalEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,110 @@
+/*
+ * 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.edit.policies;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.scxml.modeling.ModelingPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.If3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Log3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Param7EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Raise3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Script4EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Send3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Validate3EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingDiagramUpdater;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingNodeDescriptor;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class FinalizeFinalizeCompartment3CanonicalEditPolicy extends
+		CanonicalEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	Set myFeaturesToSynchronize;
+
+	/**
+	 * @generated
+	 */
+	protected List getSemanticChildrenList() {
+		View viewObject = (View) getHost().getModel();
+		List result = new LinkedList();
+		for (Iterator it = ModelingDiagramUpdater
+				.getFinalizeFinalizeCompartment_7038SemanticChildren(viewObject)
+				.iterator(); it.hasNext();) {
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
+		}
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isOrphaned(Collection semanticChildren, final View view) {
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
+		switch (visualID) {
+		case If3EditPart.VISUAL_ID:
+		case Assign3EditPart.VISUAL_ID:
+		case Raise3EditPart.VISUAL_ID:
+		case Log3EditPart.VISUAL_ID:
+		case Validate3EditPart.VISUAL_ID:
+		case Cancel3EditPart.VISUAL_ID:
+		case Send3EditPart.VISUAL_ID:
+		case Param7EditPart.VISUAL_ID:
+		case Script4EditPart.VISUAL_ID:
+		case ExtenExecContent3EditPart.VISUAL_ID:
+			if (!semanticChildren.contains(view.getElement())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getDefaultFactoryHint() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Set getFeaturesToSynchronize() {
+		if (myFeaturesToSynchronize == null) {
+			myFeaturesToSynchronize = new HashSet();
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getFinalize_ExecutableContent());
+		}
+		return myFeaturesToSynchronize;
+	}
+
+}

Propchange: 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/FinalizeFinalizeCompartment3CanonicalEditPolicy.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/edit/policies/FinalizeFinalizeCompartment3ItemSemanticEditPolicy.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/FinalizeFinalizeCompartment3ItemSemanticEditPolicy.java?rev=960911&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/edit/policies/FinalizeFinalizeCompartment3ItemSemanticEditPolicy.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/edit/policies/FinalizeFinalizeCompartment3ItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,117 @@
+/*
+ * 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.edit.policies;
+
+import org.apache.commons.scxml.modeling.ModelingPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Assign3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Cancel3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.ExtenExecContent3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.If3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Log3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Param7CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Raise3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Script4CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Send3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Validate3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+
+/**
+ * @generated
+ */
+public class FinalizeFinalizeCompartment3ItemSemanticEditPolicy extends
+		ModelingBaseItemSemanticEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	protected Command getCreateCommand(CreateElementRequest req) {
+		if (ModelingElementTypes.If_3053 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new If3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Assign_3054 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Assign3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Raise_3055 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Raise3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Log_3056 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Log3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Validate_3057 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Validate3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Cancel_3058 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Cancel3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Send_3059 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Send3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Param_3060 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Param7CreateCommand(req));
+		}
+		if (ModelingElementTypes.Script_3061 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Script4CreateCommand(req));
+		}
+		if (ModelingElementTypes.ExtenExecContent_3062 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new ExtenExecContent3CreateCommand(req));
+		}
+		return super.getCreateCommand(req);
+	}
+
+}

Propchange: 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/FinalizeFinalizeCompartment3ItemSemanticEditPolicy.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/edit/policies/FinalizeFinalizeCompartmentCanonicalEditPolicy.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/FinalizeFinalizeCompartmentCanonicalEditPolicy.java?rev=960911&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/edit/policies/FinalizeFinalizeCompartmentCanonicalEditPolicy.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/edit/policies/FinalizeFinalizeCompartmentCanonicalEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,110 @@
+/*
+ * 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.edit.policies;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.scxml.modeling.ModelingPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.If3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Log3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Param7EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Raise3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Script4EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Send3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Validate3EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingDiagramUpdater;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingNodeDescriptor;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class FinalizeFinalizeCompartmentCanonicalEditPolicy extends
+		CanonicalEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	Set myFeaturesToSynchronize;
+
+	/**
+	 * @generated
+	 */
+	protected List getSemanticChildrenList() {
+		View viewObject = (View) getHost().getModel();
+		List result = new LinkedList();
+		for (Iterator it = ModelingDiagramUpdater
+				.getFinalizeFinalizeCompartment_7031SemanticChildren(viewObject)
+				.iterator(); it.hasNext();) {
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
+		}
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isOrphaned(Collection semanticChildren, final View view) {
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
+		switch (visualID) {
+		case If3EditPart.VISUAL_ID:
+		case Assign3EditPart.VISUAL_ID:
+		case Raise3EditPart.VISUAL_ID:
+		case Log3EditPart.VISUAL_ID:
+		case Validate3EditPart.VISUAL_ID:
+		case Cancel3EditPart.VISUAL_ID:
+		case Send3EditPart.VISUAL_ID:
+		case Param7EditPart.VISUAL_ID:
+		case Script4EditPart.VISUAL_ID:
+		case ExtenExecContent3EditPart.VISUAL_ID:
+			if (!semanticChildren.contains(view.getElement())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getDefaultFactoryHint() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Set getFeaturesToSynchronize() {
+		if (myFeaturesToSynchronize == null) {
+			myFeaturesToSynchronize = new HashSet();
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getFinalize_ExecutableContent());
+		}
+		return myFeaturesToSynchronize;
+	}
+
+}

Propchange: 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/FinalizeFinalizeCompartmentCanonicalEditPolicy.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/edit/policies/FinalizeFinalizeCompartmentItemSemanticEditPolicy.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/FinalizeFinalizeCompartmentItemSemanticEditPolicy.java?rev=960911&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/edit/policies/FinalizeFinalizeCompartmentItemSemanticEditPolicy.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/edit/policies/FinalizeFinalizeCompartmentItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,117 @@
+/*
+ * 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.edit.policies;
+
+import org.apache.commons.scxml.modeling.ModelingPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Assign3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Cancel3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.ExtenExecContent3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.If3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Log3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Param7CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Raise3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Script4CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Send3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Validate3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+
+/**
+ * @generated
+ */
+public class FinalizeFinalizeCompartmentItemSemanticEditPolicy extends
+		ModelingBaseItemSemanticEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	protected Command getCreateCommand(CreateElementRequest req) {
+		if (ModelingElementTypes.If_3053 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new If3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Assign_3054 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Assign3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Raise_3055 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Raise3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Log_3056 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Log3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Validate_3057 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Validate3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Cancel_3058 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Cancel3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Send_3059 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Send3CreateCommand(req));
+		}
+		if (ModelingElementTypes.Param_3060 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Param7CreateCommand(req));
+		}
+		if (ModelingElementTypes.Script_3061 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new Script4CreateCommand(req));
+		}
+		if (ModelingElementTypes.ExtenExecContent_3062 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getFinalize_ExecutableContent());
+			}
+			return getGEFWrapper(new ExtenExecContent3CreateCommand(req));
+		}
+		return super.getCreateCommand(req);
+	}
+
+}

Propchange: 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/FinalizeFinalizeCompartmentItemSemanticEditPolicy.java
------------------------------------------------------------------------------
    svn:eol-style = native

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/FinalizeItemSemanticEditPolicy.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/FinalizeItemSemanticEditPolicy.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/edit/policies/FinalizeItemSemanticEditPolicy.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/FinalizeItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -16,10 +16,26 @@
  */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
+import java.util.Iterator;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeFinalizeCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.If3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Log3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Param7EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Raise3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Script4EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Send3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Validate3EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;
 import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
 
 /**
  * @generated
@@ -32,9 +48,64 @@ public class FinalizeItemSemanticEditPol
 	 */
 	protected Command getDestroyElementCommand(DestroyElementRequest req) {
 		CompoundCommand cc = getDestroyEdgesCommand();
+		addDestroyChildNodesCommand(cc);
 		addDestroyShortcutsCommand(cc);
 		cc.add(getGEFWrapper(new DestroyElementCommand(req)));
 		return cc.unwrap();
 	}
 
+	/**
+	 * @generated
+	 */
+	protected void addDestroyChildNodesCommand(CompoundCommand cmd) {
+		View view = (View) getHost().getModel();
+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
+		if (annotation != null) {
+			return;
+		}
+		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
+			Node node = (Node) it.next();
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
+			case FinalizeFinalizeCompartmentEditPart.VISUAL_ID:
+				for (Iterator cit = node.getChildren().iterator(); cit
+						.hasNext();) {
+					Node cnode = (Node) cit.next();
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
+					case If3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Assign3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Raise3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Log3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Validate3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Cancel3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Send3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Param7EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Script4EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case ExtenExecContent3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					}
+				}
+				break;
+			}
+		}
+	}
+
 }

Added: 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/If3ItemSemanticEditPolicy.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/If3ItemSemanticEditPolicy.java?rev=960911&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/edit/policies/If3ItemSemanticEditPolicy.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/edit/policies/If3ItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,80 @@
+/*
+ * 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.edit.policies;
+
+import java.util.Iterator;
+
+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.IfIfCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class If3ItemSemanticEditPolicy extends
+		ModelingBaseItemSemanticEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	protected Command getDestroyElementCommand(DestroyElementRequest req) {
+		CompoundCommand cc = getDestroyEdgesCommand();
+		addDestroyChildNodesCommand(cc);
+		addDestroyShortcutsCommand(cc);
+		cc.add(getGEFWrapper(new DestroyElementCommand(req)));
+		return cc.unwrap();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void addDestroyChildNodesCommand(CompoundCommand cmd) {
+		View view = (View) getHost().getModel();
+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
+		if (annotation != null) {
+			return;
+		}
+		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
+			Node node = (Node) it.next();
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
+			case IfIfCompartment3EditPart.VISUAL_ID:
+				for (Iterator cit = node.getChildren().iterator(); cit
+						.hasNext();) {
+					Node cnode = (Node) cit.next();
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
+					case ElseIfEditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case ElseEditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					}
+				}
+				break;
+			}
+		}
+	}
+
+}

Propchange: 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/If3ItemSemanticEditPolicy.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/edit/policies/IfIfCompartment3CanonicalEditPolicy.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/IfIfCompartment3CanonicalEditPolicy.java?rev=960911&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/edit/policies/IfIfCompartment3CanonicalEditPolicy.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/edit/policies/IfIfCompartment3CanonicalEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,94 @@
+/*
+ * 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.edit.policies;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.scxml.modeling.ModelingPackage;
+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.part.ModelingDiagramUpdater;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingNodeDescriptor;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class IfIfCompartment3CanonicalEditPolicy extends CanonicalEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	Set myFeaturesToSynchronize;
+
+	/**
+	 * @generated
+	 */
+	protected List getSemanticChildrenList() {
+		View viewObject = (View) getHost().getModel();
+		List result = new LinkedList();
+		for (Iterator it = ModelingDiagramUpdater
+				.getIfIfCompartment_7032SemanticChildren(viewObject).iterator(); it
+				.hasNext();) {
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
+		}
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isOrphaned(Collection semanticChildren, final View view) {
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
+		switch (visualID) {
+		case ElseIfEditPart.VISUAL_ID:
+		case ElseEditPart.VISUAL_ID:
+			if (!semanticChildren.contains(view.getElement())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getDefaultFactoryHint() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Set getFeaturesToSynchronize() {
+		if (myFeaturesToSynchronize == null) {
+			myFeaturesToSynchronize = new HashSet();
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getIf_Elseif());
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE.getIf_Else());
+		}
+		return myFeaturesToSynchronize;
+	}
+
+}

Propchange: 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/IfIfCompartment3CanonicalEditPolicy.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/edit/policies/IfIfCompartment3ItemSemanticEditPolicy.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/IfIfCompartment3ItemSemanticEditPolicy.java?rev=960911&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/edit/policies/IfIfCompartment3ItemSemanticEditPolicy.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/edit/policies/IfIfCompartment3ItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,53 @@
+/*
+ * 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.edit.policies;
+
+import org.apache.commons.scxml.modeling.ModelingPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.ElseCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.ElseIfCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+
+/**
+ * @generated
+ */
+public class IfIfCompartment3ItemSemanticEditPolicy extends
+		ModelingBaseItemSemanticEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	protected Command getCreateCommand(CreateElementRequest req) {
+		if (ModelingElementTypes.ElseIf_3003 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getIf_Elseif());
+			}
+			return getGEFWrapper(new ElseIfCreateCommand(req));
+		}
+		if (ModelingElementTypes.Else_3004 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getIf_Else());
+			}
+			return getGEFWrapper(new ElseCreateCommand(req));
+		}
+		return super.getCreateCommand(req);
+	}
+
+}

Propchange: 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/IfIfCompartment3ItemSemanticEditPolicy.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/edit/policies/Invoke2ItemSemanticEditPolicy.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/Invoke2ItemSemanticEditPolicy.java?rev=960911&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/edit/policies/Invoke2ItemSemanticEditPolicy.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/edit/policies/Invoke2ItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,84 @@
+/*
+ * 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.edit.policies;
+
+import java.util.Iterator;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Content3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeInvokeCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Param4EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class Invoke2ItemSemanticEditPolicy extends
+		ModelingBaseItemSemanticEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	protected Command getDestroyElementCommand(DestroyElementRequest req) {
+		CompoundCommand cc = getDestroyEdgesCommand();
+		addDestroyChildNodesCommand(cc);
+		addDestroyShortcutsCommand(cc);
+		cc.add(getGEFWrapper(new DestroyElementCommand(req)));
+		return cc.unwrap();
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void addDestroyChildNodesCommand(CompoundCommand cmd) {
+		View view = (View) getHost().getModel();
+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
+		if (annotation != null) {
+			return;
+		}
+		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
+			Node node = (Node) it.next();
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
+			case InvokeInvokeCompartment2EditPart.VISUAL_ID:
+				for (Iterator cit = node.getChildren().iterator(); cit
+						.hasNext();) {
+					Node cnode = (Node) cit.next();
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
+					case FinalizeEditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Param4EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Content3EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					}
+				}
+				break;
+			}
+		}
+	}
+
+}

Propchange: 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/Invoke2ItemSemanticEditPolicy.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/edit/policies/InvokeInvokeCompartment2CanonicalEditPolicy.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/InvokeInvokeCompartment2CanonicalEditPolicy.java?rev=960911&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/edit/policies/InvokeInvokeCompartment2CanonicalEditPolicy.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/edit/policies/InvokeInvokeCompartment2CanonicalEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,100 @@
+/*
+ * 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.edit.policies;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.scxml.modeling.ModelingPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Content3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Param4EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingDiagramUpdater;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingNodeDescriptor;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class InvokeInvokeCompartment2CanonicalEditPolicy extends
+		CanonicalEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	Set myFeaturesToSynchronize;
+
+	/**
+	 * @generated
+	 */
+	protected List getSemanticChildrenList() {
+		View viewObject = (View) getHost().getModel();
+		List result = new LinkedList();
+		for (Iterator it = ModelingDiagramUpdater
+				.getInvokeInvokeCompartment_7037SemanticChildren(viewObject)
+				.iterator(); it.hasNext();) {
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
+		}
+		return result;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected boolean isOrphaned(Collection semanticChildren, final View view) {
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
+		switch (visualID) {
+		case FinalizeEditPart.VISUAL_ID:
+		case Param4EditPart.VISUAL_ID:
+		case Content3EditPart.VISUAL_ID:
+			if (!semanticChildren.contains(view.getElement())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected String getDefaultFactoryHint() {
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected Set getFeaturesToSynchronize() {
+		if (myFeaturesToSynchronize == null) {
+			myFeaturesToSynchronize = new HashSet();
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getInvoke_Finalize());
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getInvoke_Param());
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getInvoke_Content());
+		}
+		return myFeaturesToSynchronize;
+	}
+
+}

Propchange: 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/InvokeInvokeCompartment2CanonicalEditPolicy.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/edit/policies/InvokeInvokeCompartment2ItemSemanticEditPolicy.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/InvokeInvokeCompartment2ItemSemanticEditPolicy.java?rev=960911&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/edit/policies/InvokeInvokeCompartment2ItemSemanticEditPolicy.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/edit/policies/InvokeInvokeCompartment2ItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,61 @@
+/*
+ * 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.edit.policies;
+
+import org.apache.commons.scxml.modeling.ModelingPackage;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Content3CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.FinalizeCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Param4CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+
+/**
+ * @generated
+ */
+public class InvokeInvokeCompartment2ItemSemanticEditPolicy extends
+		ModelingBaseItemSemanticEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	protected Command getCreateCommand(CreateElementRequest req) {
+		if (ModelingElementTypes.Finalize_3027 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getInvoke_Finalize());
+			}
+			return getGEFWrapper(new FinalizeCreateCommand(req));
+		}
+		if (ModelingElementTypes.Param_3028 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getInvoke_Param());
+			}
+			return getGEFWrapper(new Param4CreateCommand(req));
+		}
+		if (ModelingElementTypes.Content_3029 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getInvoke_Content());
+			}
+			return getGEFWrapper(new Content3CreateCommand(req));
+		}
+		return super.getCreateCommand(req);
+	}
+
+}

Propchange: 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/InvokeInvokeCompartment2ItemSemanticEditPolicy.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/edit/policies/Log3ItemSemanticEditPolicy.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/Log3ItemSemanticEditPolicy.java?rev=960911&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/edit/policies/Log3ItemSemanticEditPolicy.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/edit/policies/Log3ItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,40 @@
+/*
+ * 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.edit.policies;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+
+/**
+ * @generated
+ */
+public class Log3ItemSemanticEditPolicy extends
+		ModelingBaseItemSemanticEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	protected Command getDestroyElementCommand(DestroyElementRequest req) {
+		CompoundCommand cc = getDestroyEdgesCommand();
+		addDestroyShortcutsCommand(cc);
+		cc.add(getGEFWrapper(new DestroyElementCommand(req)));
+		return cc.unwrap();
+	}
+
+}

Propchange: 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/Log3ItemSemanticEditPolicy.java
------------------------------------------------------------------------------
    svn:eol-style = native

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/Parallel2ItemSemanticEditPolicy.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/Parallel2ItemSemanticEditPolicy.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/edit/policies/Parallel2ItemSemanticEditPolicy.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/Parallel2ItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -20,8 +20,10 @@ import java.util.Iterator;
 
 import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionReorientCommand;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Finalize3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Invoke2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntry2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExit2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel3EditPart;
@@ -77,9 +79,6 @@ public class Parallel2ItemSemanticEditPo
 					case HistoryState2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
-					case AnchorEditPart.VISUAL_ID:
-						cmd.add(getDestroyElementCommand(cnode));
-						break;
 					case Parallel3EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
@@ -92,6 +91,15 @@ public class Parallel2ItemSemanticEditPo
 					case State2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
+					case DataModel2EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Invoke2EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Finalize3EditPart.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/Parallel3ItemSemanticEditPolicy.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/Parallel3ItemSemanticEditPolicy.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/edit/policies/Parallel3ItemSemanticEditPolicy.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/Parallel3ItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -20,8 +20,10 @@ import java.util.Iterator;
 
 import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionReorientCommand;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Finalize3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Invoke2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntry2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExit2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel3EditPart;
@@ -77,9 +79,6 @@ public class Parallel3ItemSemanticEditPo
 					case HistoryState2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
-					case AnchorEditPart.VISUAL_ID:
-						cmd.add(getDestroyElementCommand(cnode));
-						break;
 					case Parallel3EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
@@ -92,6 +91,15 @@ public class Parallel3ItemSemanticEditPo
 					case State2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
+					case DataModel2EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Invoke2EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Finalize3EditPart.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/ParallelItemSemanticEditPolicy.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/ParallelItemSemanticEditPolicy.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/edit/policies/ParallelItemSemanticEditPolicy.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/ParallelItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -20,8 +20,10 @@ import java.util.Iterator;
 
 import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionReorientCommand;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Finalize3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Invoke2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntry2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExit2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel3EditPart;
@@ -81,9 +83,6 @@ public class ParallelItemSemanticEditPol
 					case HistoryState2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
-					case AnchorEditPart.VISUAL_ID:
-						cmd.add(getDestroyElementCommand(cnode));
-						break;
 					case Parallel3EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
@@ -96,6 +95,15 @@ public class ParallelItemSemanticEditPol
 					case State2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
+					case DataModel2EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Invoke2EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Finalize3EditPart.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/ParallelParallelCompartment2CanonicalEditPolicy.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/ParallelParallelCompartment2CanonicalEditPolicy.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/edit/policies/ParallelParallelCompartment2CanonicalEditPolicy.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/ParallelParallelCompartment2CanonicalEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -24,8 +24,10 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.scxml.modeling.ModelingPackage;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Finalize3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Invoke2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntry2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExit2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel3EditPart;
@@ -68,11 +70,13 @@ public class ParallelParallelCompartment
 		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case HistoryState2EditPart.VISUAL_ID:
-		case AnchorEditPart.VISUAL_ID:
 		case Parallel3EditPart.VISUAL_ID:
 		case OnEntry2EditPart.VISUAL_ID:
 		case OnExit2EditPart.VISUAL_ID:
 		case State2EditPart.VISUAL_ID:
+		case DataModel2EditPart.VISUAL_ID:
+		case Invoke2EditPart.VISUAL_ID:
+		case Finalize3EditPart.VISUAL_ID:
 			if (!semanticChildren.contains(view.getElement())) {
 				return true;
 			}
@@ -96,8 +100,6 @@ public class ParallelParallelCompartment
 			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getParallel_HistoryState());
 			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
-					.getParallel_Anchor());
-			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getParallel_Parallel());
 			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getParallel_OnEntry());
@@ -105,6 +107,12 @@ public class ParallelParallelCompartment
 					.getParallel_OnExit());
 			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getParallel_State());
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getNamedElement_DataModel());
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getParallel_Invoke());
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getParallel_Finalize());
 		}
 		return myFeaturesToSynchronize;
 	}

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/ParallelParallelCompartment2ItemSemanticEditPolicy.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/ParallelParallelCompartment2ItemSemanticEditPolicy.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/edit/policies/ParallelParallelCompartment2ItemSemanticEditPolicy.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/ParallelParallelCompartment2ItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -18,7 +18,10 @@ package org.apache.commons.scxml.modelin
 
 import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.AnchorCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.DataModel2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Finalize3CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.HistoryState2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Invoke2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.OnEntry2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.OnExit2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Parallel3CreateCommand;
@@ -44,13 +47,6 @@ public class ParallelParallelCompartment
 			}
 			return getGEFWrapper(new HistoryState2CreateCommand(req));
 		}
-		if (ModelingElementTypes.Anchor_3034 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ModelingPackage.eINSTANCE
-						.getParallel_Anchor());
-			}
-			return getGEFWrapper(new AnchorCreateCommand(req));
-		}
 		if (ModelingElementTypes.Parallel_3035 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
@@ -79,6 +75,27 @@ public class ParallelParallelCompartment
 			}
 			return getGEFWrapper(new State2CreateCommand(req));
 		}
+		if (ModelingElementTypes.DataModel_3063 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getNamedElement_DataModel());
+			}
+			return getGEFWrapper(new DataModel2CreateCommand(req));
+		}
+		if (ModelingElementTypes.Invoke_3065 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getParallel_Invoke());
+			}
+			return getGEFWrapper(new Invoke2CreateCommand(req));
+		}
+		if (ModelingElementTypes.Finalize_3066 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getParallel_Finalize());
+			}
+			return getGEFWrapper(new Finalize3CreateCommand(req));
+		}
 		return super.getCreateCommand(req);
 	}
 



Mime
View raw message