commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gu...@apache.org
Subject svn commit: r945691 [15/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/ServiceTemplateCanonicalEditPolicy.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/ServiceTemplateCanonicalEditPolicy.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/ServiceTemplateCanonicalEditPolicy.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/ServiceTemplateCanonicalEditPolicy.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;
@@ -26,7 +10,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Anchor2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.AnchorEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign2EditPart;
@@ -83,10 +66,11 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.TranslationEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Validate2EditPart;
 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.ScxmlLinkDescriptor;
-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.ModelingLinkDescriptor;
+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.core.runtime.IAdaptable;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.EditPart;
@@ -119,10 +103,10 @@ public class ServiceTemplateCanonicalEdi
 	protected List getSemanticChildrenList() {
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
-		for (Iterator it = ScxmlDiagramUpdater
+		for (Iterator it = ModelingDiagramUpdater
 				.getServiceTemplate_79SemanticChildren(viewObject).iterator(); it
 				.hasNext();) {
-			result.add(((ScxmlNodeDescriptor) it.next()).getModelElement());
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}
 		return result;
 	}
@@ -138,7 +122,7 @@ public class ServiceTemplateCanonicalEdi
 	 * @generated
 	 */
 	protected boolean isOrphaned(Collection semanticChildren, final View view) {
-		int visualID = ScxmlVisualIDRegistry.getVisualID(view);
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case StateEditPart.VISUAL_ID:
 		case InitialStateEditPart.VISUAL_ID:
@@ -166,17 +150,17 @@ public class ServiceTemplateCanonicalEdi
 	protected Set getFeaturesToSynchronize() {
 		if (myFeaturesToSynchronize == null) {
 			myFeaturesToSynchronize = new HashSet();
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getServiceTemplate_StateList());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getServiceTemplate_InitialState());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getServiceTemplate_Script());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getServiceTemplate_Parallel());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getServiceTemplate_DataModel());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getServiceTemplate_FinalState());
 		}
 		return myFeaturesToSynchronize;
@@ -250,7 +234,7 @@ public class ServiceTemplateCanonicalEdi
 		for (Iterator linksIterator = existingLinks.iterator(); linksIterator
 				.hasNext();) {
 			Edge nextDiagramLink = (Edge) linksIterator.next();
-			int diagramLinkVisualID = ScxmlVisualIDRegistry
+			int diagramLinkVisualID = ModelingVisualIDRegistry
 					.getVisualID(nextDiagramLink);
 			if (diagramLinkVisualID == -1) {
 				if (nextDiagramLink.getSource() != null
@@ -264,7 +248,7 @@ public class ServiceTemplateCanonicalEdi
 			EObject diagramLinkDst = nextDiagramLink.getTarget().getElement();
 			for (Iterator LinkDescriptorsIterator = linkDescriptors.iterator(); LinkDescriptorsIterator
 					.hasNext();) {
-				ScxmlLinkDescriptor nextLinkDescriptor = (ScxmlLinkDescriptor) LinkDescriptorsIterator
+				ModelingLinkDescriptor nextLinkDescriptor = (ModelingLinkDescriptor) LinkDescriptorsIterator
 						.next();
 				if (diagramLinkObject == nextLinkDescriptor.getModelElement()
 						&& diagramLinkSrc == nextLinkDescriptor.getSource()
@@ -285,15 +269,15 @@ public class ServiceTemplateCanonicalEdi
 	 * @generated
 	 */
 	private Collection collectAllLinks(View view, Map domain2NotationMap) {
-		if (!ServiceTemplateEditPart.MODEL_ID.equals(ScxmlVisualIDRegistry
+		if (!ServiceTemplateEditPart.MODEL_ID.equals(ModelingVisualIDRegistry
 				.getModelID(view))) {
 			return Collections.EMPTY_LIST;
 		}
 		Collection result = new LinkedList();
-		switch (ScxmlVisualIDRegistry.getVisualID(view)) {
+		switch (ModelingVisualIDRegistry.getVisualID(view)) {
 		case ServiceTemplateEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getServiceTemplate_79ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -304,7 +288,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case StateEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getState_1001ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -315,7 +299,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case InitialStateEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getInitialState_1002ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -326,7 +310,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case ScriptEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getScript_1003ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -337,7 +321,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case ParallelEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getParallel_1004ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -348,7 +332,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case DataModelEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getDataModel_1005ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -359,7 +343,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case FinalStateEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getFinalState_1006ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -370,7 +354,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case OnEntryEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getOnEntry_2001ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -381,7 +365,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case IfEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getIf_2002ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -392,7 +376,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case ElseIfEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getElseIf_2003ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -403,7 +387,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case ElseEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getElse_2004ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -414,7 +398,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case AssignEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getAssign_2005ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -425,7 +409,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case RaiseEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getRaise_2006ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -436,7 +420,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case LogEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getLog_2007ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -447,7 +431,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case ValidateEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getValidate_2008ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -458,7 +442,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case CancelEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getCancel_2009ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -469,7 +453,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case SendEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getSend_2010ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -480,7 +464,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case ParamEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getParam_2011ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -491,7 +475,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case ContentEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getContent_2012ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -502,7 +486,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Content2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getContent_2013ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -513,7 +497,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Param2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getParam_2014ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -524,7 +508,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Script2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getScript_2015ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -535,7 +519,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case OnExitEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getOnExit_2016ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -546,7 +530,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case If2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getIf_2017ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -557,7 +541,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Assign2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getAssign_2018ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -568,7 +552,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Raise2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getRaise_2019ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -579,7 +563,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Log2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getLog_2020ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -590,7 +574,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Validate2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getValidate_2021ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -601,7 +585,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Cancel2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getCancel_2022ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -612,7 +596,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Param3EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getParam_2023ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -623,7 +607,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Send2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getSend_2024ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -634,7 +618,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Script3EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getScript_2025ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -645,7 +629,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case InvokeEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getInvoke_2026ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -656,7 +640,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case FinalizeEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getFinalize_2027ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -667,7 +651,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Param4EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getParam_2028ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -678,7 +662,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Content3EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getContent_2029ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -689,7 +673,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case InitialState2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getInitialState_2030ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -700,7 +684,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case HistoryStateEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getHistoryState_2031ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -711,7 +695,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Parallel2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getParallel_2032ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -722,7 +706,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case HistoryState2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getHistoryState_2033ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -733,7 +717,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case AnchorEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getAnchor_2034ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -744,7 +728,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Parallel3EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getParallel_2035ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -755,7 +739,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case OnEntry2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getOnEntry_2036ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -766,7 +750,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case OnExit2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getOnExit_2037ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -777,7 +761,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case State2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getState_2038ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -788,7 +772,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Anchor2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getAnchor_2039ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -799,7 +783,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case FinalState2EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getFinalState_2040ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -810,7 +794,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case DonedataEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getDonedata_2041ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -821,7 +805,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Param5EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getParam_2042ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -832,7 +816,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Content4EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getContent_2043ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -843,7 +827,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case OnEntry3EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getOnEntry_2044ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -854,7 +838,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case OnExit3EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getOnExit_2045ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -865,7 +849,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case State3EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getState_2046ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -876,7 +860,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case DataEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getData_2047ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -887,7 +871,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case Content5EditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getContent_2048ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -898,7 +882,7 @@ public class ServiceTemplateCanonicalEdi
 		}
 		case TranslationEditPart.VISUAL_ID: {
 			if (!domain2NotationMap.containsKey(view.getElement())) {
-				result.addAll(ScxmlDiagramUpdater
+				result.addAll(ModelingDiagramUpdater
 						.getTranslation_3001ContainedLinks(view));
 			}
 			if (!domain2NotationMap.containsKey(view.getElement())
@@ -928,7 +912,7 @@ public class ServiceTemplateCanonicalEdi
 		List adapters = new LinkedList();
 		for (Iterator linkDescriptorsIterator = linkDescriptors.iterator(); linkDescriptorsIterator
 				.hasNext();) {
-			final ScxmlLinkDescriptor nextLinkDescriptor = (ScxmlLinkDescriptor) linkDescriptorsIterator
+			final ModelingLinkDescriptor nextLinkDescriptor = (ModelingLinkDescriptor) linkDescriptorsIterator
 					.next();
 			EditPart sourceEditPart = getEditPart(nextLinkDescriptor
 					.getSource(), domain2NotationMap);

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/ServiceTemplateItemSemanticEditPolicy.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/ServiceTemplateItemSemanticEditPolicy.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/ServiceTemplateItemSemanticEditPolicy.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/ServiceTemplateItemSemanticEditPolicy.java Tue May 18 15:13:13 2010
@@ -1,29 +1,13 @@
-/*
- * 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.DataModelCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.FinalStateCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.InitialStateCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.ParallelCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.ScriptCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.StateCreateCommand;
-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.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
@@ -35,50 +19,50 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class ServiceTemplateItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ScxmlElementTypes.State_1001 == req.getElementType()) {
+		if (ModelingElementTypes.State_1001 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getServiceTemplate_StateList());
 			}
 			return getGEFWrapper(new StateCreateCommand(req));
 		}
-		if (ScxmlElementTypes.InitialState_1002 == req.getElementType()) {
+		if (ModelingElementTypes.InitialState_1002 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getServiceTemplate_InitialState());
 			}
 			return getGEFWrapper(new InitialStateCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Script_1003 == req.getElementType()) {
+		if (ModelingElementTypes.Script_1003 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getServiceTemplate_Script());
 			}
 			return getGEFWrapper(new ScriptCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Parallel_1004 == req.getElementType()) {
+		if (ModelingElementTypes.Parallel_1004 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getServiceTemplate_Parallel());
 			}
 			return getGEFWrapper(new ParallelCreateCommand(req));
 		}
-		if (ScxmlElementTypes.DataModel_1005 == req.getElementType()) {
+		if (ModelingElementTypes.DataModel_1005 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getServiceTemplate_DataModel());
 			}
 			return getGEFWrapper(new DataModelCreateCommand(req));
 		}
-		if (ScxmlElementTypes.FinalState_1006 == req.getElementType()) {
+		if (ModelingElementTypes.FinalState_1006 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getServiceTemplate_FinalState());
 			}
 			return getGEFWrapper(new FinalStateCreateCommand(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/State2ItemSemanticEditPolicy.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/State2ItemSemanticEditPolicy.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/State2ItemSemanticEditPolicy.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/State2ItemSemanticEditPolicy.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;
@@ -31,8 +15,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.State3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartment2EditPart;
 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;
@@ -47,7 +31,7 @@ import org.eclipse.gmf.runtime.notation.
  * @generated
  */
 public class State2ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
@@ -71,12 +55,12 @@ public class State2ItemSemanticEditPolic
 		}
 		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
 			Node node = (Node) it.next();
-			switch (ScxmlVisualIDRegistry.getVisualID(node)) {
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
 			case StateStateCompartment2EditPart.VISUAL_ID:
 				for (Iterator cit = node.getChildren().iterator(); cit
 						.hasNext();) {
 					Node cnode = (Node) cit.next();
-					switch (ScxmlVisualIDRegistry.getVisualID(cnode)) {
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
 					case OnEntryEditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
@@ -126,7 +110,7 @@ public class State2ItemSemanticEditPolic
 	 */
 	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()));
 		}
@@ -138,7 +122,7 @@ public class State2ItemSemanticEditPolic
 	 */
 	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/State3ItemSemanticEditPolicy.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/State3ItemSemanticEditPolicy.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/State3ItemSemanticEditPolicy.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/State3ItemSemanticEditPolicy.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;
@@ -31,8 +15,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.State3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartment3EditPart;
 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;
@@ -47,7 +31,7 @@ import org.eclipse.gmf.runtime.notation.
  * @generated
  */
 public class State3ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
@@ -71,12 +55,12 @@ public class State3ItemSemanticEditPolic
 		}
 		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
 			Node node = (Node) it.next();
-			switch (ScxmlVisualIDRegistry.getVisualID(node)) {
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
 			case StateStateCompartment3EditPart.VISUAL_ID:
 				for (Iterator cit = node.getChildren().iterator(); cit
 						.hasNext();) {
 					Node cnode = (Node) cit.next();
-					switch (ScxmlVisualIDRegistry.getVisualID(cnode)) {
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
 					case OnEntryEditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
@@ -126,7 +110,7 @@ public class State3ItemSemanticEditPolic
 	 */
 	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()));
 		}
@@ -138,7 +122,7 @@ public class State3ItemSemanticEditPolic
 	 */
 	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/StateItemSemanticEditPolicy.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/StateItemSemanticEditPolicy.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/StateItemSemanticEditPolicy.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/StateItemSemanticEditPolicy.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;
@@ -31,8 +15,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.State3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartmentEditPart;
 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;
@@ -47,7 +31,7 @@ import org.eclipse.gmf.runtime.notation.
  * @generated
  */
 public class StateItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
@@ -75,12 +59,12 @@ public class StateItemSemanticEditPolicy
 		}
 		for (Iterator it = view.getChildren().iterator(); it.hasNext();) {
 			Node node = (Node) it.next();
-			switch (ScxmlVisualIDRegistry.getVisualID(node)) {
+			switch (ModelingVisualIDRegistry.getVisualID(node)) {
 			case StateStateCompartmentEditPart.VISUAL_ID:
 				for (Iterator cit = node.getChildren().iterator(); cit
 						.hasNext();) {
 					Node cnode = (Node) cit.next();
-					switch (ScxmlVisualIDRegistry.getVisualID(cnode)) {
+					switch (ModelingVisualIDRegistry.getVisualID(cnode)) {
 					case OnEntryEditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
@@ -130,7 +114,7 @@ public class StateItemSemanticEditPolicy
 	 */
 	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()));
 		}
@@ -142,7 +126,7 @@ public class StateItemSemanticEditPolicy
 	 */
 	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/StateStateCompartment2CanonicalEditPolicy.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/StateStateCompartment2CanonicalEditPolicy.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/StateStateCompartment2CanonicalEditPolicy.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/StateStateCompartment2CanonicalEditPolicy.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.Anchor2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
@@ -33,9 +16,10 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.State3EditPart;
-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 StateStateCompartment2Canon
 	protected List getSemanticChildrenList() {
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
-		for (Iterator it = ScxmlDiagramUpdater
+		for (Iterator it = ModelingDiagramUpdater
 				.getStateStateCompartment_5016SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
-			result.add(((ScxmlNodeDescriptor) it.next()).getModelElement());
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}
 		return result;
 	}
@@ -68,7 +52,7 @@ public class StateStateCompartment2Canon
 	 * @generated
 	 */
 	protected boolean isOrphaned(Collection semanticChildren, final View view) {
-		int visualID = ScxmlVisualIDRegistry.getVisualID(view);
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case OnEntryEditPart.VISUAL_ID:
 		case OnExitEditPart.VISUAL_ID:
@@ -99,23 +83,23 @@ public class StateStateCompartment2Canon
 	protected Set getFeaturesToSynchronize() {
 		if (myFeaturesToSynchronize == null) {
 			myFeaturesToSynchronize = new HashSet();
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_OnEntry());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_OnExit());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_Invoke());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_InitState());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_HistoryState());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_SubParallel());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_Anchor());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_FinalState());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_SubState());
 		}
 		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/StateStateCompartment2ItemSemanticEditPolicy.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/StateStateCompartment2ItemSemanticEditPolicy.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/StateStateCompartment2ItemSemanticEditPolicy.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/StateStateCompartment2ItemSemanticEditPolicy.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.Anchor2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.FinalState2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.HistoryStateCreateCommand;
@@ -26,7 +9,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.commands.OnExitCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Parallel2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.State3CreateCommand;
-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 StateStateCompartment2ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ScxmlElementTypes.OnEntry_2001 == req.getElementType()) {
+		if (ModelingElementTypes.OnEntry_2001 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_OnEntry());
 			}
 			return getGEFWrapper(new OnEntryCreateCommand(req));
 		}
-		if (ScxmlElementTypes.OnExit_2016 == req.getElementType()) {
+		if (ModelingElementTypes.OnExit_2016 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_OnExit());
 			}
 			return getGEFWrapper(new OnExitCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Invoke_2026 == req.getElementType()) {
+		if (ModelingElementTypes.Invoke_2026 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_Invoke());
 			}
 			return getGEFWrapper(new InvokeCreateCommand(req));
 		}
-		if (ScxmlElementTypes.InitialState_2030 == req.getElementType()) {
+		if (ModelingElementTypes.InitialState_2030 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_InitState());
 			}
 			return getGEFWrapper(new InitialState2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.HistoryState_2031 == req.getElementType()) {
+		if (ModelingElementTypes.HistoryState_2031 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_HistoryState());
 			}
 			return getGEFWrapper(new HistoryStateCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Parallel_2032 == req.getElementType()) {
+		if (ModelingElementTypes.Parallel_2032 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_SubParallel());
 			}
 			return getGEFWrapper(new Parallel2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Anchor_2039 == req.getElementType()) {
+		if (ModelingElementTypes.Anchor_2039 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_Anchor());
 			}
 			return getGEFWrapper(new Anchor2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.FinalState_2040 == req.getElementType()) {
+		if (ModelingElementTypes.FinalState_2040 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_FinalState());
 			}
 			return getGEFWrapper(new FinalState2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.State_2046 == req.getElementType()) {
+		if (ModelingElementTypes.State_2046 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_SubState());
 			}
 			return getGEFWrapper(new State3CreateCommand(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/StateStateCompartment3CanonicalEditPolicy.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/StateStateCompartment3CanonicalEditPolicy.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/StateStateCompartment3CanonicalEditPolicy.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/StateStateCompartment3CanonicalEditPolicy.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.Anchor2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
@@ -33,9 +16,10 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.State3EditPart;
-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 StateStateCompartment3Canon
 	protected List getSemanticChildrenList() {
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
-		for (Iterator it = ScxmlDiagramUpdater
+		for (Iterator it = ModelingDiagramUpdater
 				.getStateStateCompartment_5022SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
-			result.add(((ScxmlNodeDescriptor) it.next()).getModelElement());
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}
 		return result;
 	}
@@ -68,7 +52,7 @@ public class StateStateCompartment3Canon
 	 * @generated
 	 */
 	protected boolean isOrphaned(Collection semanticChildren, final View view) {
-		int visualID = ScxmlVisualIDRegistry.getVisualID(view);
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case OnEntryEditPart.VISUAL_ID:
 		case OnExitEditPart.VISUAL_ID:
@@ -99,23 +83,23 @@ public class StateStateCompartment3Canon
 	protected Set getFeaturesToSynchronize() {
 		if (myFeaturesToSynchronize == null) {
 			myFeaturesToSynchronize = new HashSet();
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_OnEntry());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_OnExit());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_Invoke());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_InitState());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_HistoryState());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_SubParallel());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_Anchor());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_FinalState());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_SubState());
 		}
 		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/StateStateCompartment3ItemSemanticEditPolicy.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/StateStateCompartment3ItemSemanticEditPolicy.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/StateStateCompartment3ItemSemanticEditPolicy.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/StateStateCompartment3ItemSemanticEditPolicy.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.Anchor2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.FinalState2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.HistoryStateCreateCommand;
@@ -26,7 +9,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.commands.OnExitCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Parallel2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.State3CreateCommand;
-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 StateStateCompartment3ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ScxmlElementTypes.OnEntry_2001 == req.getElementType()) {
+		if (ModelingElementTypes.OnEntry_2001 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_OnEntry());
 			}
 			return getGEFWrapper(new OnEntryCreateCommand(req));
 		}
-		if (ScxmlElementTypes.OnExit_2016 == req.getElementType()) {
+		if (ModelingElementTypes.OnExit_2016 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_OnExit());
 			}
 			return getGEFWrapper(new OnExitCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Invoke_2026 == req.getElementType()) {
+		if (ModelingElementTypes.Invoke_2026 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_Invoke());
 			}
 			return getGEFWrapper(new InvokeCreateCommand(req));
 		}
-		if (ScxmlElementTypes.InitialState_2030 == req.getElementType()) {
+		if (ModelingElementTypes.InitialState_2030 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_InitState());
 			}
 			return getGEFWrapper(new InitialState2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.HistoryState_2031 == req.getElementType()) {
+		if (ModelingElementTypes.HistoryState_2031 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_HistoryState());
 			}
 			return getGEFWrapper(new HistoryStateCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Parallel_2032 == req.getElementType()) {
+		if (ModelingElementTypes.Parallel_2032 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_SubParallel());
 			}
 			return getGEFWrapper(new Parallel2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Anchor_2039 == req.getElementType()) {
+		if (ModelingElementTypes.Anchor_2039 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_Anchor());
 			}
 			return getGEFWrapper(new Anchor2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.FinalState_2040 == req.getElementType()) {
+		if (ModelingElementTypes.FinalState_2040 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_FinalState());
 			}
 			return getGEFWrapper(new FinalState2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.State_2046 == req.getElementType()) {
+		if (ModelingElementTypes.State_2046 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_SubState());
 			}
 			return getGEFWrapper(new State3CreateCommand(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/StateStateCompartmentCanonicalEditPolicy.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/StateStateCompartmentCanonicalEditPolicy.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/StateStateCompartmentCanonicalEditPolicy.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/StateStateCompartmentCanonicalEditPolicy.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.Anchor2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
@@ -33,9 +16,10 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.State3EditPart;
-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 StateStateCompartmentCanoni
 	protected List getSemanticChildrenList() {
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
-		for (Iterator it = ScxmlDiagramUpdater
+		for (Iterator it = ModelingDiagramUpdater
 				.getStateStateCompartment_5001SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
-			result.add(((ScxmlNodeDescriptor) it.next()).getModelElement());
+			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}
 		return result;
 	}
@@ -68,7 +52,7 @@ public class StateStateCompartmentCanoni
 	 * @generated
 	 */
 	protected boolean isOrphaned(Collection semanticChildren, final View view) {
-		int visualID = ScxmlVisualIDRegistry.getVisualID(view);
+		int visualID = ModelingVisualIDRegistry.getVisualID(view);
 		switch (visualID) {
 		case OnEntryEditPart.VISUAL_ID:
 		case OnExitEditPart.VISUAL_ID:
@@ -99,23 +83,23 @@ public class StateStateCompartmentCanoni
 	protected Set getFeaturesToSynchronize() {
 		if (myFeaturesToSynchronize == null) {
 			myFeaturesToSynchronize = new HashSet();
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_OnEntry());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_OnExit());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_Invoke());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_InitState());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_HistoryState());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_SubParallel());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_Anchor());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_FinalState());
-			myFeaturesToSynchronize.add(ScxmlPackage.eINSTANCE
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_SubState());
 		}
 		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/StateStateCompartmentItemSemanticEditPolicy.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/StateStateCompartmentItemSemanticEditPolicy.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/StateStateCompartmentItemSemanticEditPolicy.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/StateStateCompartmentItemSemanticEditPolicy.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.Anchor2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.FinalState2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.HistoryStateCreateCommand;
@@ -26,7 +9,8 @@ import org.apache.commons.scxml.modeling
 import org.apache.commons.scxml.modeling.diagram.edit.commands.OnExitCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Parallel2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.State3CreateCommand;
-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 StateStateCompartmentItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ScxmlElementTypes.OnEntry_2001 == req.getElementType()) {
+		if (ModelingElementTypes.OnEntry_2001 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_OnEntry());
 			}
 			return getGEFWrapper(new OnEntryCreateCommand(req));
 		}
-		if (ScxmlElementTypes.OnExit_2016 == req.getElementType()) {
+		if (ModelingElementTypes.OnExit_2016 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_OnExit());
 			}
 			return getGEFWrapper(new OnExitCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Invoke_2026 == req.getElementType()) {
+		if (ModelingElementTypes.Invoke_2026 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_Invoke());
 			}
 			return getGEFWrapper(new InvokeCreateCommand(req));
 		}
-		if (ScxmlElementTypes.InitialState_2030 == req.getElementType()) {
+		if (ModelingElementTypes.InitialState_2030 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_InitState());
 			}
 			return getGEFWrapper(new InitialState2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.HistoryState_2031 == req.getElementType()) {
+		if (ModelingElementTypes.HistoryState_2031 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_HistoryState());
 			}
 			return getGEFWrapper(new HistoryStateCreateCommand(req));
 		}
-		if (ScxmlElementTypes.Parallel_2032 == req.getElementType()) {
+		if (ModelingElementTypes.Parallel_2032 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_SubParallel());
 			}
 			return getGEFWrapper(new Parallel2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.Anchor_2039 == req.getElementType()) {
+		if (ModelingElementTypes.Anchor_2039 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_Anchor());
 			}
 			return getGEFWrapper(new Anchor2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.FinalState_2040 == req.getElementType()) {
+		if (ModelingElementTypes.FinalState_2040 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_FinalState());
 			}
 			return getGEFWrapper(new FinalState2CreateCommand(req));
 		}
-		if (ScxmlElementTypes.State_2046 == req.getElementType()) {
+		if (ModelingElementTypes.State_2046 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ScxmlPackage.eINSTANCE
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getState_SubState());
 			}
 			return getGEFWrapper(new State3CreateCommand(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/TranslationItemSemanticEditPolicy.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/TranslationItemSemanticEditPolicy.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/TranslationItemSemanticEditPolicy.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/TranslationItemSemanticEditPolicy.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 org.eclipse.gef.commands.Command;
@@ -24,7 +8,7 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class TranslationItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated

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/Validate2ItemSemanticEditPolicy.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/Validate2ItemSemanticEditPolicy.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/Validate2ItemSemanticEditPolicy.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/Validate2ItemSemanticEditPolicy.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 org.eclipse.gef.commands.Command;
@@ -25,7 +9,7 @@ import org.eclipse.gmf.runtime.emf.type.
  * @generated
  */
 public class Validate2ItemSemanticEditPolicy extends
-		ScxmlBaseItemSemanticEditPolicy {
+		ModelingBaseItemSemanticEditPolicy {
 
 	/**
 	 * @generated



Mime
View raw message