You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gu...@apache.org on 2010/05/21 08:05:06 UTC

svn commit: r946887 [8/21] - in /commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml: diagram/ modeling/diagram/edit/commands/ modeling/diagram/edit/helpers/ modeling/diagra...

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment2ItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment2ItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment2ItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment2ItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,8 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Content2CreateCommand;
 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;
 
@@ -16,7 +32,7 @@ public class ContentContentCompartment2I
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ModelingElementTypes.Content_2013 == req.getElementType()) {
+		if (ModelingElementTypes.Content_3013 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getContent_Content());

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment3CanonicalEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment3CanonicalEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment3CanonicalEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment3CanonicalEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;
@@ -7,11 +23,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
 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;
 
@@ -33,7 +49,7 @@ public class ContentContentCompartment3C
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
 		for (Iterator it = ModelingDiagramUpdater
-				.getContentContentCompartment_5011SemanticChildren(viewObject)
+				.getContentContentCompartment_7011SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
 			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment3ItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment3ItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment3ItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment3ItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,8 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Content2CreateCommand;
 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;
 
@@ -16,7 +32,7 @@ public class ContentContentCompartment3I
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ModelingElementTypes.Content_2013 == req.getElementType()) {
+		if (ModelingElementTypes.Content_3013 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getContent_Content());

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment4CanonicalEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment4CanonicalEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment4CanonicalEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment4CanonicalEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;
@@ -7,11 +23,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
 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;
 
@@ -33,7 +49,7 @@ public class ContentContentCompartment4C
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
 		for (Iterator it = ModelingDiagramUpdater
-				.getContentContentCompartment_5019SemanticChildren(viewObject)
+				.getContentContentCompartment_7019SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
 			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment4ItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment4ItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment4ItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment4ItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,8 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Content2CreateCommand;
 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;
 
@@ -16,7 +32,7 @@ public class ContentContentCompartment4I
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ModelingElementTypes.Content_2013 == req.getElementType()) {
+		if (ModelingElementTypes.Content_3013 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getContent_Content());

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment5CanonicalEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment5CanonicalEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment5CanonicalEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment5CanonicalEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;
@@ -7,11 +23,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
 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;
 
@@ -33,7 +49,7 @@ public class ContentContentCompartment5C
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
 		for (Iterator it = ModelingDiagramUpdater
-				.getContentContentCompartment_5026SemanticChildren(viewObject)
+				.getContentContentCompartment_7026SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
 			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment5ItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment5ItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment5ItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartment5ItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,8 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Content2CreateCommand;
 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;
 
@@ -16,7 +32,7 @@ public class ContentContentCompartment5I
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ModelingElementTypes.Content_2013 == req.getElementType()) {
+		if (ModelingElementTypes.Content_3013 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getContent_Content());

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartmentCanonicalEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartmentCanonicalEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartmentCanonicalEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartmentCanonicalEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;
@@ -7,11 +23,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
 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;
 
@@ -33,7 +49,7 @@ public class ContentContentCompartmentCa
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
 		for (Iterator it = ModelingDiagramUpdater
-				.getContentContentCompartment_5005SemanticChildren(viewObject)
+				.getContentContentCompartment_7005SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
 			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartmentItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartmentItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartmentItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentContentCompartmentItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,8 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Content2CreateCommand;
 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;
 
@@ -16,7 +32,7 @@ public class ContentContentCompartmentIt
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ModelingElementTypes.Content_2013 == req.getElementType()) {
+		if (ModelingElementTypes.Content_3013 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getContent_Content());

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ContentItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataDataCompartmentCanonicalEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataDataCompartmentCanonicalEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataDataCompartmentCanonicalEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataDataCompartmentCanonicalEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;
@@ -7,11 +23,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Content5EditPart;
 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;
 
@@ -32,7 +48,7 @@ public class DataDataCompartmentCanonica
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
 		for (Iterator it = ModelingDiagramUpdater
-				.getDataDataCompartment_5025SemanticChildren(viewObject)
+				.getDataDataCompartment_7025SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
 			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataDataCompartmentItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataDataCompartmentItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataDataCompartmentItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataDataCompartmentItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,8 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Content5CreateCommand;
 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;
 
@@ -16,7 +32,7 @@ public class DataDataCompartmentItemSema
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ModelingElementTypes.Content_2048 == req.getElementType()) {
+		if (ModelingElementTypes.Content_3048 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getData_Content());

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataModelDataModelCompartmentCanonicalEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataModelDataModelCompartmentCanonicalEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataModelDataModelCompartmentCanonicalEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataModelDataModelCompartmentCanonicalEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;
@@ -7,11 +23,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.DataEditPart;
 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;
 
@@ -33,7 +49,7 @@ public class DataModelDataModelCompartme
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
 		for (Iterator it = ModelingDiagramUpdater
-				.getDataModelDataModelCompartment_5024SemanticChildren(
+				.getDataModelDataModelCompartment_7024SemanticChildren(
 						viewObject).iterator(); it.hasNext();) {
 			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataModelDataModelCompartmentItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataModelDataModelCompartmentItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataModelDataModelCompartmentItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataModelDataModelCompartmentItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,8 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.DataCreateCommand;
 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;
 
@@ -16,7 +32,7 @@ public class DataModelDataModelCompartme
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ModelingElementTypes.Data_2047 == req.getElementType()) {
+		if (ModelingElementTypes.Data_3047 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getDataModel_Data());

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataModelItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataModelItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataModelItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DataModelItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DonedataDonedataCompartmentCanonicalEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DonedataDonedataCompartmentCanonicalEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DonedataDonedataCompartmentCanonicalEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DonedataDonedataCompartmentCanonicalEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;
@@ -7,12 +23,12 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Content4EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.Param5EditPart;
 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;
 
@@ -34,7 +50,7 @@ public class DonedataDonedataCompartment
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
 		for (Iterator it = ModelingDiagramUpdater
-				.getDonedataDonedataCompartment_5018SemanticChildren(viewObject)
+				.getDonedataDonedataCompartment_7018SemanticChildren(viewObject)
 				.iterator(); it.hasNext();) {
 			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DonedataDonedataCompartmentItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DonedataDonedataCompartmentItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DonedataDonedataCompartmentItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DonedataDonedataCompartmentItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,9 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Content4CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Param5CreateCommand;
 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;
 
@@ -17,14 +33,14 @@ public class DonedataDonedataCompartment
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ModelingElementTypes.Param_2042 == req.getElementType()) {
+		if (ModelingElementTypes.Param_3042 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getDonedata_Param());
 			}
 			return getGEFWrapper(new Param5CreateCommand(req));
 		}
-		if (ModelingElementTypes.Content_2043 == req.getElementType()) {
+		if (ModelingElementTypes.Content_3043 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getDonedata_Content());

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DonedataItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DonedataItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DonedataItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/DonedataItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ElseIfItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ElseIfItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ElseIfItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ElseIfItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ElseItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ElseItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ElseItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/ElseItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalState2ItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalState2ItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalState2ItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalState2ItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,14 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Iterator;
 
-import org.apache.commons.scxml.modeling.diagram.edit.commands.TranslationCreateCommand;
-import org.apache.commons.scxml.modeling.diagram.edit.commands.TranslationReorientCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionReorientCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.DonedataEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateFinalStateCompartmentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntry3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExit3EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.TranslationEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.TransitionEditPart;
 import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
 import org.eclipse.emf.ecore.EAnnotation;
@@ -86,8 +102,8 @@ public class FinalState2ItemSemanticEdit
 	 */
 	protected Command getStartCreateRelationshipCommand(
 			CreateRelationshipRequest req) {
-		if (ModelingElementTypes.Translation_3001 == req.getElementType()) {
-			return getGEFWrapper(new TranslationCreateCommand(req, req
+		if (ModelingElementTypes.Transition_4001 == req.getElementType()) {
+			return getGEFWrapper(new TransitionCreateCommand(req, req
 					.getSource(), req.getTarget()));
 		}
 		return null;
@@ -98,8 +114,8 @@ public class FinalState2ItemSemanticEdit
 	 */
 	protected Command getCompleteCreateRelationshipCommand(
 			CreateRelationshipRequest req) {
-		if (ModelingElementTypes.Translation_3001 == req.getElementType()) {
-			return getGEFWrapper(new TranslationCreateCommand(req, req
+		if (ModelingElementTypes.Transition_4001 == req.getElementType()) {
+			return getGEFWrapper(new TransitionCreateCommand(req, req
 					.getSource(), req.getTarget()));
 		}
 		return null;
@@ -114,8 +130,8 @@ public class FinalState2ItemSemanticEdit
 	protected Command getReorientRelationshipCommand(
 			ReorientRelationshipRequest req) {
 		switch (getVisualID(req)) {
-		case TranslationEditPart.VISUAL_ID:
-			return getGEFWrapper(new TranslationReorientCommand(req));
+		case TransitionEditPart.VISUAL_ID:
+			return getGEFWrapper(new TransitionReorientCommand(req));
 		}
 		return super.getReorientRelationshipCommand(req);
 	}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartment2CanonicalEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartment2CanonicalEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartment2CanonicalEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartment2CanonicalEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;
@@ -7,13 +23,13 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.DonedataEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntry3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExit3EditPart;
 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;
 
@@ -35,7 +51,7 @@ public class FinalStateFinalStateCompart
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
 		for (Iterator it = ModelingDiagramUpdater
-				.getFinalStateFinalStateCompartment_5027SemanticChildren(
+				.getFinalStateFinalStateCompartment_7027SemanticChildren(
 						viewObject).iterator(); it.hasNext();) {
 			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartment2ItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartment2ItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartment2ItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartment2ItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,10 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.DonedataCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.OnEntry3CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.OnExit3CreateCommand;
 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;
 
@@ -18,21 +34,21 @@ public class FinalStateFinalStateCompart
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ModelingElementTypes.Donedata_2041 == req.getElementType()) {
+		if (ModelingElementTypes.Donedata_3041 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getFinalState_Donedata());
 			}
 			return getGEFWrapper(new DonedataCreateCommand(req));
 		}
-		if (ModelingElementTypes.OnEntry_2044 == req.getElementType()) {
+		if (ModelingElementTypes.OnEntry_3044 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getFinalState_OnEntry());
 			}
 			return getGEFWrapper(new OnEntry3CreateCommand(req));
 		}
-		if (ModelingElementTypes.OnExit_2045 == req.getElementType()) {
+		if (ModelingElementTypes.OnExit_3045 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getFinalState_OnExit());

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartmentCanonicalEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartmentCanonicalEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartmentCanonicalEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartmentCanonicalEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;
@@ -7,13 +23,13 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.DonedataEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntry3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExit3EditPart;
 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;
 
@@ -35,7 +51,7 @@ public class FinalStateFinalStateCompart
 		View viewObject = (View) getHost().getModel();
 		List result = new LinkedList();
 		for (Iterator it = ModelingDiagramUpdater
-				.getFinalStateFinalStateCompartment_5017SemanticChildren(
+				.getFinalStateFinalStateCompartment_7017SemanticChildren(
 						viewObject).iterator(); it.hasNext();) {
 			result.add(((ModelingNodeDescriptor) it.next()).getModelElement());
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartmentItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartmentItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartmentItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateFinalStateCompartmentItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,10 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.DonedataCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.OnEntry3CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.OnExit3CreateCommand;
 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;
 
@@ -18,21 +34,21 @@ public class FinalStateFinalStateCompart
 	 * @generated
 	 */
 	protected Command getCreateCommand(CreateElementRequest req) {
-		if (ModelingElementTypes.Donedata_2041 == req.getElementType()) {
+		if (ModelingElementTypes.Donedata_3041 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getFinalState_Donedata());
 			}
 			return getGEFWrapper(new DonedataCreateCommand(req));
 		}
-		if (ModelingElementTypes.OnEntry_2044 == req.getElementType()) {
+		if (ModelingElementTypes.OnEntry_3044 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getFinalState_OnEntry());
 			}
 			return getGEFWrapper(new OnEntry3CreateCommand(req));
 		}
-		if (ModelingElementTypes.OnExit_2045 == req.getElementType()) {
+		if (ModelingElementTypes.OnExit_3045 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
 						.getFinalState_OnExit());

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalStateItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,14 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.commons.scxml.modeling.diagram.edit.policies;
 
 import java.util.Iterator;
 
-import org.apache.commons.scxml.modeling.diagram.edit.commands.TranslationCreateCommand;
-import org.apache.commons.scxml.modeling.diagram.edit.commands.TranslationReorientCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionReorientCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.DonedataEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateFinalStateCompartment2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntry3EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExit3EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.TranslationEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.TransitionEditPart;
 import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
 import org.eclipse.emf.ecore.EAnnotation;
@@ -90,8 +106,8 @@ public class FinalStateItemSemanticEditP
 	 */
 	protected Command getStartCreateRelationshipCommand(
 			CreateRelationshipRequest req) {
-		if (ModelingElementTypes.Translation_3001 == req.getElementType()) {
-			return getGEFWrapper(new TranslationCreateCommand(req, req
+		if (ModelingElementTypes.Transition_4001 == req.getElementType()) {
+			return getGEFWrapper(new TransitionCreateCommand(req, req
 					.getSource(), req.getTarget()));
 		}
 		return null;
@@ -102,8 +118,8 @@ public class FinalStateItemSemanticEditP
 	 */
 	protected Command getCompleteCreateRelationshipCommand(
 			CreateRelationshipRequest req) {
-		if (ModelingElementTypes.Translation_3001 == req.getElementType()) {
-			return getGEFWrapper(new TranslationCreateCommand(req, req
+		if (ModelingElementTypes.Transition_4001 == req.getElementType()) {
+			return getGEFWrapper(new TransitionCreateCommand(req, req
 					.getSource(), req.getTarget()));
 		}
 		return null;
@@ -118,8 +134,8 @@ public class FinalStateItemSemanticEditP
 	protected Command getReorientRelationshipCommand(
 			ReorientRelationshipRequest req) {
 		switch (getVisualID(req)) {
-		case TranslationEditPart.VISUAL_ID:
-			return getGEFWrapper(new TranslationReorientCommand(req));
+		case TransitionEditPart.VISUAL_ID:
+			return getGEFWrapper(new TransitionReorientCommand(req));
 		}
 		return super.getReorientRelationshipCommand(req);
 	}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalizeItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalizeItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalizeItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/FinalizeItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,3 +1,19 @@
+/*
+ * 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;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/HistoryState2ItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/HistoryState2ItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/HistoryState2ItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/HistoryState2ItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,8 +1,24 @@
+/*
+ * 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.diagram.edit.commands.TranslationCreateCommand;
-import org.apache.commons.scxml.modeling.diagram.edit.commands.TranslationReorientCommand;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.TranslationEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionReorientCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.TransitionEditPart;
 import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;
@@ -42,8 +58,8 @@ public class HistoryState2ItemSemanticEd
 	 */
 	protected Command getStartCreateRelationshipCommand(
 			CreateRelationshipRequest req) {
-		if (ModelingElementTypes.Translation_3001 == req.getElementType()) {
-			return getGEFWrapper(new TranslationCreateCommand(req, req
+		if (ModelingElementTypes.Transition_4001 == req.getElementType()) {
+			return getGEFWrapper(new TransitionCreateCommand(req, req
 					.getSource(), req.getTarget()));
 		}
 		return null;
@@ -54,8 +70,8 @@ public class HistoryState2ItemSemanticEd
 	 */
 	protected Command getCompleteCreateRelationshipCommand(
 			CreateRelationshipRequest req) {
-		if (ModelingElementTypes.Translation_3001 == req.getElementType()) {
-			return getGEFWrapper(new TranslationCreateCommand(req, req
+		if (ModelingElementTypes.Transition_4001 == req.getElementType()) {
+			return getGEFWrapper(new TransitionCreateCommand(req, req
 					.getSource(), req.getTarget()));
 		}
 		return null;
@@ -70,8 +86,8 @@ public class HistoryState2ItemSemanticEd
 	protected Command getReorientRelationshipCommand(
 			ReorientRelationshipRequest req) {
 		switch (getVisualID(req)) {
-		case TranslationEditPart.VISUAL_ID:
-			return getGEFWrapper(new TranslationReorientCommand(req));
+		case TransitionEditPart.VISUAL_ID:
+			return getGEFWrapper(new TransitionReorientCommand(req));
 		}
 		return super.getReorientRelationshipCommand(req);
 	}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/HistoryStateItemSemanticEditPolicy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/HistoryStateItemSemanticEditPolicy.java?rev=946887&r1=946886&r2=946887&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/HistoryStateItemSemanticEditPolicy.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/HistoryStateItemSemanticEditPolicy.java Fri May 21 06:04:54 2010
@@ -1,8 +1,24 @@
+/*
+ * 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.diagram.edit.commands.TranslationCreateCommand;
-import org.apache.commons.scxml.modeling.diagram.edit.commands.TranslationReorientCommand;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.TranslationEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionCreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionReorientCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.TransitionEditPart;
 import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
 import org.eclipse.gef.commands.Command;
 import org.eclipse.gef.commands.CompoundCommand;
@@ -42,8 +58,8 @@ public class HistoryStateItemSemanticEdi
 	 */
 	protected Command getStartCreateRelationshipCommand(
 			CreateRelationshipRequest req) {
-		if (ModelingElementTypes.Translation_3001 == req.getElementType()) {
-			return getGEFWrapper(new TranslationCreateCommand(req, req
+		if (ModelingElementTypes.Transition_4001 == req.getElementType()) {
+			return getGEFWrapper(new TransitionCreateCommand(req, req
 					.getSource(), req.getTarget()));
 		}
 		return null;
@@ -54,8 +70,8 @@ public class HistoryStateItemSemanticEdi
 	 */
 	protected Command getCompleteCreateRelationshipCommand(
 			CreateRelationshipRequest req) {
-		if (ModelingElementTypes.Translation_3001 == req.getElementType()) {
-			return getGEFWrapper(new TranslationCreateCommand(req, req
+		if (ModelingElementTypes.Transition_4001 == req.getElementType()) {
+			return getGEFWrapper(new TransitionCreateCommand(req, req
 					.getSource(), req.getTarget()));
 		}
 		return null;
@@ -70,8 +86,8 @@ public class HistoryStateItemSemanticEdi
 	protected Command getReorientRelationshipCommand(
 			ReorientRelationshipRequest req) {
 		switch (getVisualID(req)) {
-		case TranslationEditPart.VISUAL_ID:
-			return getGEFWrapper(new TranslationReorientCommand(req));
+		case TransitionEditPart.VISUAL_ID:
+			return getGEFWrapper(new TransitionReorientCommand(req));
 		}
 		return super.getReorientRelationshipCommand(req);
 	}