commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gu...@apache.org
Subject svn commit: r945691 [13/39] - in /commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src: main/java/org.apache.commons.scxml.diagram/ main/java/org.apache.commons.scxml.diagram/META-INF/ main/java/org.apache.commons.scxml.diagram/icons/obj16/ main/java/org....
Date Tue, 18 May 2010 15:13:31 GMT
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnEntryOnEntryCompartment3CanonicalEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnEntryOnEntryCompartment3CanonicalEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -23,7 +7,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 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.IfEditPart;
@@ -33,9 +16,10 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Script2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.SendEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ValidateEditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramUpdater;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlNodeDescriptor;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+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.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
 
@@ -56,10 +40,10 @@ public class OnEntryOnEntryCompartment3C
 	protected List getSemanticChildrenList() {
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
-		for (Iterator it = ScxmlDiagramUpdater
+		for (Iterator it = ModelingDiagramUpdater
 				.getOnEntryOnEntryCompartment_5020SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
-			result.add(((ScxmlNodeDescriptor) it.next()).getModelElement());
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}
 		return result;
 	}
@@ -68,7 +52,7 @@ public class OnEntryOnEntryCompartment3C
 	 * @generated
 	 */
 	protected boolean isOrphaned(Collection semanticChildren, final View view) {
-		int visualID = ScxmlVisualIDRegistry.getVisualID(view);
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case IfEditPart.VISUAL_ID:
 		case AssignEditPart.VISUAL_ID:
@@ -99,9 +83,9 @@ public class OnEntryOnEntryCompartment3C
 	protected Set getFeaturesToSynchronize() {
 		if (myFeaturesToSynchronize == null) {
 			myFeaturesToSynchronize = new HashSet();
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getOnEntry_ExecutableContext());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getOnEntry_Script());
 		}
 		return myFeaturesToSynchronize;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnEntryOnEntryCompartment3ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnEntryOnEntryCompartment3ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,22 +1,5 @@
-/*
- * 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.ScxmlPackage;
 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.IfCreateCommand;
@@ -26,7 +9,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Script2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.SendCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.ValidateCreateCommand;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 
@@ -34,71 +18,71 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class OnEntryOnEntryCompartment3ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ScxmlElementTypes.If_2002 == req.getElementType()) {
+		if (ModelingElementTypes.If_2002 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new IfCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Assign_2005 == req.getElementType()) {
+		if (ModelingElementTypes.Assign_2005 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new AssignCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Raise_2006 == req.getElementType()) {
+		if (ModelingElementTypes.Raise_2006 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new RaiseCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Log_2007 == req.getElementType()) {
+		if (ModelingElementTypes.Log_2007 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new LogCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Validate_2008 == req.getElementType()) {
+		if (ModelingElementTypes.Validate_2008 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new ValidateCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Cancel_2009 == req.getElementType()) {
+		if (ModelingElementTypes.Cancel_2009 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new CancelCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Send_2010 == req.getElementType()) {
+		if (ModelingElementTypes.Send_2010 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new SendCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Param_2014 == req.getElementType()) {
+		if (ModelingElementTypes.Param_2014 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new Param2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Script_2015 == req.getElementType()) {
+		if (ModelingElementTypes.Script_2015 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_Script());
 			}
 			return getGEFWrapper(new Script2CreateCommand(req));

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnEntryOnEntryCompartmentCanonicalEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnEntryOnEntryCompartmentCanonicalEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -23,7 +7,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 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.IfEditPart;
@@ -33,9 +16,10 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Script2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.SendEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ValidateEditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramUpdater;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlNodeDescriptor;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+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.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
 
@@ -56,10 +40,10 @@ public class OnEntryOnEntryCompartmentCa
 	protected List getSemanticChildrenList() {
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
-		for (Iterator it = ScxmlDiagramUpdater
+		for (Iterator it = ModelingDiagramUpdater
 				.getOnEntryOnEntryCompartment_5002SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
-			result.add(((ScxmlNodeDescriptor) it.next()).getModelElement());
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}
 		return result;
 	}
@@ -68,7 +52,7 @@ public class OnEntryOnEntryCompartmentCa
 	 * @generated
 	 */
 	protected boolean isOrphaned(Collection semanticChildren, final View view) {
-		int visualID = ScxmlVisualIDRegistry.getVisualID(view);
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case IfEditPart.VISUAL_ID:
 		case AssignEditPart.VISUAL_ID:
@@ -99,9 +83,9 @@ public class OnEntryOnEntryCompartmentCa
 	protected Set getFeaturesToSynchronize() {
 		if (myFeaturesToSynchronize == null) {
 			myFeaturesToSynchronize = new HashSet();
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getOnEntry_ExecutableContext());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getOnEntry_Script());
 		}
 		return myFeaturesToSynchronize;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnEntryOnEntryCompartmentItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnEntryOnEntryCompartmentItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,22 +1,5 @@
-/*
- * 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.ScxmlPackage;
 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.IfCreateCommand;
@@ -26,7 +9,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Script2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.SendCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.ValidateCreateCommand;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 
@@ -34,71 +18,71 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class OnEntryOnEntryCompartmentItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ScxmlElementTypes.If_2002 == req.getElementType()) {
+		if (ModelingElementTypes.If_2002 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new IfCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Assign_2005 == req.getElementType()) {
+		if (ModelingElementTypes.Assign_2005 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new AssignCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Raise_2006 == req.getElementType()) {
+		if (ModelingElementTypes.Raise_2006 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new RaiseCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Log_2007 == req.getElementType()) {
+		if (ModelingElementTypes.Log_2007 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new LogCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Validate_2008 == req.getElementType()) {
+		if (ModelingElementTypes.Validate_2008 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new ValidateCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Cancel_2009 == req.getElementType()) {
+		if (ModelingElementTypes.Cancel_2009 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new CancelCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Send_2010 == req.getElementType()) {
+		if (ModelingElementTypes.Send_2010 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new SendCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Param_2014 == req.getElementType()) {
+		if (ModelingElementTypes.Param_2014 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_ExecutableContext());
 			}
 			return getGEFWrapper(new Param2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Script_2015 == req.getElementType()) {
+		if (ModelingElementTypes.Script_2015 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnEntry_Script());
 			}
 			return getGEFWrapper(new Script2CreateCommand(req));

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExit2ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExit2ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -28,7 +12,7 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Script3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Send2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Validate2EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+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;
@@ -41,7 +25,7 @@ import org.eclipse.gmf.runtime.notation.
  * @generated
  */
 public class OnExit2ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
@@ -65,12 +49,12 @@ public class OnExit2ItemSemanticEditPoli
 		}
 		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
 			Node node = (Node) it.next();
-			switch (ScxmlVisualIDRegistry.getVisualID(node)) {
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
 			case OnExitOnExitCompartment2EditPart.VISUAL_ID:
 				for (Iterator cit = node.getChildren().iterator(); cit
 						.hasNext();) {
 					Node cnode = (Node) cit.next();
-					switch (ScxmlVisualIDRegistry.getVisualID(cnode)) {
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
 					case If2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExit3ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExit3ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -28,7 +12,7 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Script3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Send2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Validate2EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+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;
@@ -41,7 +25,7 @@ import org.eclipse.gmf.runtime.notation.
  * @generated
  */
 public class OnExit3ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
@@ -65,12 +49,12 @@ public class OnExit3ItemSemanticEditPoli
 		}
 		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
 			Node node = (Node) it.next();
-			switch (ScxmlVisualIDRegistry.getVisualID(node)) {
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
 			case OnExitOnExitCompartment3EditPart.VISUAL_ID:
 				for (Iterator cit = node.getChildren().iterator(); cit
 						.hasNext();) {
 					Node cnode = (Node) cit.next();
-					switch (ScxmlVisualIDRegistry.getVisualID(cnode)) {
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
 					case If2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -28,7 +12,7 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Script3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Send2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Validate2EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+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;
@@ -41,7 +25,7 @@ import org.eclipse.gmf.runtime.notation.
  * @generated
  */
 public class OnExitItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
@@ -65,12 +49,12 @@ public class OnExitItemSemanticEditPolic
 		}
 		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
 			Node node = (Node) it.next();
-			switch (ScxmlVisualIDRegistry.getVisualID(node)) {
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
 			case OnExitOnExitCompartmentEditPart.VISUAL_ID:
 				for (Iterator cit = node.getChildren().iterator(); cit
 						.hasNext();) {
 					Node cnode = (Node) cit.next();
-					switch (ScxmlVisualIDRegistry.getVisualID(cnode)) {
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
 					case If2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartment2CanonicalEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartment2CanonicalEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -23,7 +7,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 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.If2EditPart;
@@ -33,9 +16,10 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Script3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Send2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Validate2EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramUpdater;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlNodeDescriptor;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+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.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
 
@@ -56,10 +40,10 @@ public class OnExitOnExitCompartment2Can
 	protected List getSemanticChildrenList() {
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
-		for (Iterator it = ScxmlDiagramUpdater
+		for (Iterator it = ModelingDiagramUpdater
 				.getOnExitOnExitCompartment_5015SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
-			result.add(((ScxmlNodeDescriptor) it.next()).getModelElement());
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}
 		return result;
 	}
@@ -68,7 +52,7 @@ public class OnExitOnExitCompartment2Can
 	 * @generated
 	 */
 	protected boolean isOrphaned(Collection semanticChildren, final View view) {
-		int visualID = ScxmlVisualIDRegistry.getVisualID(view);
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case If2EditPart.VISUAL_ID:
 		case Assign2EditPart.VISUAL_ID:
@@ -99,9 +83,9 @@ public class OnExitOnExitCompartment2Can
 	protected Set getFeaturesToSynchronize() {
 		if (myFeaturesToSynchronize == null) {
 			myFeaturesToSynchronize = new HashSet();
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getOnExit_ExecutableContext());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getOnExit_Script());
 		}
 		return myFeaturesToSynchronize;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartment2ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartment2ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,22 +1,5 @@
-/*
- * 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.ScxmlPackage;
 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.If2CreateCommand;
@@ -26,7 +9,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Script3CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Send2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Validate2CreateCommand;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 
@@ -34,71 +18,71 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class OnExitOnExitCompartment2ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ScxmlElementTypes.If_2017 == req.getElementType()) {
+		if (ModelingElementTypes.If_2017 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new If2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Assign_2018 == req.getElementType()) {
+		if (ModelingElementTypes.Assign_2018 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Assign2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Raise_2019 == req.getElementType()) {
+		if (ModelingElementTypes.Raise_2019 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Raise2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Log_2020 == req.getElementType()) {
+		if (ModelingElementTypes.Log_2020 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Log2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Validate_2021 == req.getElementType()) {
+		if (ModelingElementTypes.Validate_2021 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Validate2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Cancel_2022 == req.getElementType()) {
+		if (ModelingElementTypes.Cancel_2022 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Cancel2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Param_2023 == req.getElementType()) {
+		if (ModelingElementTypes.Param_2023 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Param3CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Send_2024 == req.getElementType()) {
+		if (ModelingElementTypes.Send_2024 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Send2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Script_2025 == req.getElementType()) {
+		if (ModelingElementTypes.Script_2025 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_Script());
 			}
 			return getGEFWrapper(new Script3CreateCommand(req));

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartment3CanonicalEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartment3CanonicalEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -23,7 +7,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 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.If2EditPart;
@@ -33,9 +16,10 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Script3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Send2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Validate2EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramUpdater;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlNodeDescriptor;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+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.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
 
@@ -56,10 +40,10 @@ public class OnExitOnExitCompartment3Can
 	protected List getSemanticChildrenList() {
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
-		for (Iterator it = ScxmlDiagramUpdater
+		for (Iterator it = ModelingDiagramUpdater
 				.getOnExitOnExitCompartment_5021SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
-			result.add(((ScxmlNodeDescriptor) it.next()).getModelElement());
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}
 		return result;
 	}
@@ -68,7 +52,7 @@ public class OnExitOnExitCompartment3Can
 	 * @generated
 	 */
 	protected boolean isOrphaned(Collection semanticChildren, final View view) {
-		int visualID = ScxmlVisualIDRegistry.getVisualID(view);
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case If2EditPart.VISUAL_ID:
 		case Assign2EditPart.VISUAL_ID:
@@ -99,9 +83,9 @@ public class OnExitOnExitCompartment3Can
 	protected Set getFeaturesToSynchronize() {
 		if (myFeaturesToSynchronize == null) {
 			myFeaturesToSynchronize = new HashSet();
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getOnExit_ExecutableContext());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getOnExit_Script());
 		}
 		return myFeaturesToSynchronize;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartment3ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartment3ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,22 +1,5 @@
-/*
- * 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.ScxmlPackage;
 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.If2CreateCommand;
@@ -26,7 +9,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Script3CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Send2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Validate2CreateCommand;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 
@@ -34,71 +18,71 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class OnExitOnExitCompartment3ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ScxmlElementTypes.If_2017 == req.getElementType()) {
+		if (ModelingElementTypes.If_2017 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new If2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Assign_2018 == req.getElementType()) {
+		if (ModelingElementTypes.Assign_2018 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Assign2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Raise_2019 == req.getElementType()) {
+		if (ModelingElementTypes.Raise_2019 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Raise2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Log_2020 == req.getElementType()) {
+		if (ModelingElementTypes.Log_2020 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Log2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Validate_2021 == req.getElementType()) {
+		if (ModelingElementTypes.Validate_2021 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Validate2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Cancel_2022 == req.getElementType()) {
+		if (ModelingElementTypes.Cancel_2022 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Cancel2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Param_2023 == req.getElementType()) {
+		if (ModelingElementTypes.Param_2023 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Param3CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Send_2024 == req.getElementType()) {
+		if (ModelingElementTypes.Send_2024 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Send2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Script_2025 == req.getElementType()) {
+		if (ModelingElementTypes.Script_2025 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_Script());
 			}
 			return getGEFWrapper(new Script3CreateCommand(req));

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartmentCanonicalEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartmentCanonicalEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -23,7 +7,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 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.If2EditPart;
@@ -33,9 +16,10 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Script3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Send2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Validate2EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramUpdater;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlNodeDescriptor;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+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.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
 
@@ -56,10 +40,10 @@ public class OnExitOnExitCompartmentCano
 	protected List getSemanticChildrenList() {
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
-		for (Iterator it = ScxmlDiagramUpdater
+		for (Iterator it = ModelingDiagramUpdater
 				.getOnExitOnExitCompartment_5007SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
-			result.add(((ScxmlNodeDescriptor) it.next()).getModelElement());
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}
 		return result;
 	}
@@ -68,7 +52,7 @@ public class OnExitOnExitCompartmentCano
 	 * @generated
 	 */
 	protected boolean isOrphaned(Collection semanticChildren, final View view) {
-		int visualID = ScxmlVisualIDRegistry.getVisualID(view);
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case If2EditPart.VISUAL_ID:
 		case Assign2EditPart.VISUAL_ID:
@@ -99,9 +83,9 @@ public class OnExitOnExitCompartmentCano
 	protected Set getFeaturesToSynchronize() {
 		if (myFeaturesToSynchronize == null) {
 			myFeaturesToSynchronize = new HashSet();
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getOnExit_ExecutableContext());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getOnExit_Script());
 		}
 		return myFeaturesToSynchronize;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartmentItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/OnExitOnExitCompartmentItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,22 +1,5 @@
-/*
- * 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.ScxmlPackage;
 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.If2CreateCommand;
@@ -26,7 +9,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Script3CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Send2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Validate2CreateCommand;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 
@@ -34,71 +18,71 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class OnExitOnExitCompartmentItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ScxmlElementTypes.If_2017 == req.getElementType()) {
+		if (ModelingElementTypes.If_2017 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new If2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Assign_2018 == req.getElementType()) {
+		if (ModelingElementTypes.Assign_2018 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Assign2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Raise_2019 == req.getElementType()) {
+		if (ModelingElementTypes.Raise_2019 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Raise2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Log_2020 == req.getElementType()) {
+		if (ModelingElementTypes.Log_2020 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Log2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Validate_2021 == req.getElementType()) {
+		if (ModelingElementTypes.Validate_2021 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Validate2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Cancel_2022 == req.getElementType()) {
+		if (ModelingElementTypes.Cancel_2022 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Cancel2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Param_2023 == req.getElementType()) {
+		if (ModelingElementTypes.Param_2023 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Param3CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Send_2024 == req.getElementType()) {
+		if (ModelingElementTypes.Send_2024 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_ExecutableContext());
 			}
 			return getGEFWrapper(new Send2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Script_2025 == req.getElementType()) {
+		if (ModelingElementTypes.Script_2025 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getOnExit_Script());
 			}
 			return getGEFWrapper(new Script3CreateCommand(req));

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/Parallel2ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/Parallel2ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -28,8 +12,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartmentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.State2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.TranslationEditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;
@@ -44,7 +28,7 @@ import org.eclipse.gmf.runtime.notation.
  * @generated
  */
 public class Parallel2ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
@@ -68,12 +52,12 @@ public class Parallel2ItemSemanticEditPo
 		}
 		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
 			Node node = (Node) it.next();
-			switch (ScxmlVisualIDRegistry.getVisualID(node)) {
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
 			case ParallelParallelCompartmentEditPart.VISUAL_ID:
 				for (Iterator cit = node.getChildren().iterator(); cit
 						.hasNext();) {
 					Node cnode = (Node) cit.next();
-					switch (ScxmlVisualIDRegistry.getVisualID(cnode)) {
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
 					case HistoryState2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
@@ -114,7 +98,7 @@ public class Parallel2ItemSemanticEditPo
 	 */
 	protected Command getStartCreateRelationshipCommand(
 			CreateRelationshipRequest req) {
-		if (ScxmlElementTypes.Translation_3001 == req.getElementType()) {
+		if (ModelingElementTypes.Translation_3001 == req.getElementType()) {
 			return getGEFWrapper(new TranslationCreateCommand(req, req
 					.getSource(), req.getTarget()));
 		}
@@ -126,7 +110,7 @@ public class Parallel2ItemSemanticEditPo
 	 */
 	protected Command getCompleteCreateRelationshipCommand(
 			CreateRelationshipRequest req) {
-		if (ScxmlElementTypes.Translation_3001 == req.getElementType()) {
+		if (ModelingElementTypes.Translation_3001 == req.getElementType()) {
 			return getGEFWrapper(new TranslationCreateCommand(req, req
 					.getSource(), req.getTarget()));
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/Parallel3ItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/Parallel3ItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -28,8 +12,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartment2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.State2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.TranslationEditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;
@@ -44,7 +28,7 @@ import org.eclipse.gmf.runtime.notation.
  * @generated
  */
 public class Parallel3ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
@@ -68,12 +52,12 @@ public class Parallel3ItemSemanticEditPo
 		}
 		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
 			Node node = (Node) it.next();
-			switch (ScxmlVisualIDRegistry.getVisualID(node)) {
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
 			case ParallelParallelCompartment2EditPart.VISUAL_ID:
 				for (Iterator cit = node.getChildren().iterator(); cit
 						.hasNext();) {
 					Node cnode = (Node) cit.next();
-					switch (ScxmlVisualIDRegistry.getVisualID(cnode)) {
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
 					case HistoryState2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
@@ -114,7 +98,7 @@ public class Parallel3ItemSemanticEditPo
 	 */
 	protected Command getStartCreateRelationshipCommand(
 			CreateRelationshipRequest req) {
-		if (ScxmlElementTypes.Translation_3001 == req.getElementType()) {
+		if (ModelingElementTypes.Translation_3001 == req.getElementType()) {
 			return getGEFWrapper(new TranslationCreateCommand(req, req
 					.getSource(), req.getTarget()));
 		}
@@ -126,7 +110,7 @@ public class Parallel3ItemSemanticEditPo
 	 */
 	protected Command getCompleteCreateRelationshipCommand(
 			CreateRelationshipRequest req) {
-		if (ScxmlElementTypes.Translation_3001 == req.getElementType()) {
+		if (ModelingElementTypes.Translation_3001 == req.getElementType()) {
 			return getGEFWrapper(new TranslationCreateCommand(req, req
 					.getSource(), req.getTarget()));
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ParallelItemSemanticEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ParallelItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -28,8 +12,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartment3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.State2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.TranslationEditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;
@@ -44,7 +28,7 @@ import org.eclipse.gmf.runtime.notation.
  * @generated
  */
 public class ParallelItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
@@ -72,12 +56,12 @@ public class ParallelItemSemanticEditPol
 		}
 		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
 			Node node = (Node) it.next();
-			switch (ScxmlVisualIDRegistry.getVisualID(node)) {
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
 			case ParallelParallelCompartment3EditPart.VISUAL_ID:
 				for (Iterator cit = node.getChildren().iterator(); cit
 						.hasNext();) {
 					Node cnode = (Node) cit.next();
-					switch (ScxmlVisualIDRegistry.getVisualID(cnode)) {
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
 					case HistoryState2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
@@ -118,7 +102,7 @@ public class ParallelItemSemanticEditPol
 	 */
 	protected Command getStartCreateRelationshipCommand(
 			CreateRelationshipRequest req) {
-		if (ScxmlElementTypes.Translation_3001 == req.getElementType()) {
+		if (ModelingElementTypes.Translation_3001 == req.getElementType()) {
 			return getGEFWrapper(new TranslationCreateCommand(req, req
 					.getSource(), req.getTarget()));
 		}
@@ -130,7 +114,7 @@ public class ParallelItemSemanticEditPol
 	 */
 	protected Command getCompleteCreateRelationshipCommand(
 			CreateRelationshipRequest req) {
-		if (ScxmlElementTypes.Translation_3001 == req.getElementType()) {
+		if (ModelingElementTypes.Translation_3001 == req.getElementType()) {
 			return getGEFWrapper(new TranslationCreateCommand(req, req
 					.getSource(), req.getTarget()));
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ParallelParallelCompartment2CanonicalEditPolicy.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.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.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ParallelParallelCompartment2CanonicalEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * 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;
@@ -23,16 +7,16 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryState2EditPart;
 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;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.State2EditPart;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlDiagramUpdater;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlNodeDescriptor;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+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.apache.commons.scxml.modeling.ModelingPackage;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
 import org.eclipse.gmf.runtime.notation.View;
 
@@ -53,10 +37,10 @@ public class ParallelParallelCompartment
 	protected List getSemanticChildrenList() {
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
-		for (Iterator it = ScxmlDiagramUpdater
+		for (Iterator it = ModelingDiagramUpdater
 				.getParallelParallelCompartment_5013SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
-			result.add(((ScxmlNodeDescriptor) it.next()).getModelElement());
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}
 		return result;
 	}
@@ -65,7 +49,7 @@ public class ParallelParallelCompartment
 	 * @generated
 	 */
 	protected boolean isOrphaned(Collection semanticChildren, final View view) {
-		int visualID = ScxmlVisualIDRegistry.getVisualID(view);
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case HistoryState2EditPart.VISUAL_ID:
 		case AnchorEditPart.VISUAL_ID:
@@ -93,17 +77,17 @@ public class ParallelParallelCompartment
 	protected Set getFeaturesToSynchronize() {
 		if (myFeaturesToSynchronize == null) {
 			myFeaturesToSynchronize = new HashSet();
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getParallel_HistoryState());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getParallel_Anchor());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getParallel_Parallel());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getParallel_OnEntry());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getParallel_OnExit());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getParallel_State());
 		}
 		return myFeaturesToSynchronize;



Mime
View raw message