commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gu...@apache.org
Subject svn commit: r960911 [10/15] - in /commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram: edit/commands/ edit/parts/ edit/policies/ navigator/ part/ providers/...
Date Tue, 06 Jul 2010 15:09:56 GMT
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/StateItemSemanticEditPolicy.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/StateItemSemanticEditPolicy.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateItemSemanticEditPolicy.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/StateItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -20,8 +20,9 @@ import java.util.Iterator;
 
 import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.TransitionReorientCommand;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Anchor2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModel2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Finalize2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.InitialState2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeEditPart;
@@ -99,15 +100,18 @@ public class StateItemSemanticEditPolicy
 					case Parallel2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
-					case Anchor2EditPart.VISUAL_ID:
-						cmd.add(getDestroyElementCommand(cnode));
-						break;
 					case FinalState2EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
 					case State3EditPart.VISUAL_ID:
 						cmd.add(getDestroyElementCommand(cnode));
 						break;
+					case DataModel2EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
+					case Finalize2EditPart.VISUAL_ID:
+						cmd.add(getDestroyElementCommand(cnode));
+						break;
 					}
 				}
 				break;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment2CanonicalEditPolicy.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/StateStateCompartment2CanonicalEditPolicy.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment2CanonicalEditPolicy.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/StateStateCompartment2CanonicalEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -24,8 +24,9 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.scxml.modeling.ModelingPackage;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Anchor2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModel2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Finalize2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.InitialState2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeEditPart;
@@ -76,9 +77,10 @@ public class StateStateCompartment2Canon
 		case InitialState2EditPart.VISUAL_ID:
 		case HistoryStateEditPart.VISUAL_ID:
 		case Parallel2EditPart.VISUAL_ID:
-		case Anchor2EditPart.VISUAL_ID:
 		case FinalState2EditPart.VISUAL_ID:
 		case State3EditPart.VISUAL_ID:
+		case DataModel2EditPart.VISUAL_ID:
+		case Finalize2EditPart.VISUAL_ID:
 			if (!semanticChildren.contains(view.getElement())) {
 				return true;
 			}
@@ -112,11 +114,13 @@ public class StateStateCompartment2Canon
 			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_SubParallel());
 			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
-					.getState_Anchor());
-			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_FinalState());
 			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_SubState());
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getNamedElement_DataModel());
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getState_Finalize());
 		}
 		return myFeaturesToSynchronize;
 	}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment2ItemSemanticEditPolicy.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/StateStateCompartment2ItemSemanticEditPolicy.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment2ItemSemanticEditPolicy.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/StateStateCompartment2ItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -18,7 +18,9 @@ package org.apache.commons.scxml.modelin
 
 import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Anchor2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.DataModel2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.FinalState2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Finalize2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.HistoryStateCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.InitialState2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.InvokeCreateCommand;
@@ -82,13 +84,6 @@ public class StateStateCompartment2ItemS
 			}
 			return getGEFWrapper(new Parallel2CreateCommand(req));
 		}
-		if (ModelingElementTypes.Anchor_3039 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ModelingPackage.eINSTANCE
-						.getState_Anchor());
-			}
-			return getGEFWrapper(new Anchor2CreateCommand(req));
-		}
 		if (ModelingElementTypes.FinalState_3040 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
@@ -103,6 +98,20 @@ public class StateStateCompartment2ItemS
 			}
 			return getGEFWrapper(new State3CreateCommand(req));
 		}
+		if (ModelingElementTypes.DataModel_3063 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getNamedElement_DataModel());
+			}
+			return getGEFWrapper(new DataModel2CreateCommand(req));
+		}
+		if (ModelingElementTypes.Finalize_3064 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getState_Finalize());
+			}
+			return getGEFWrapper(new Finalize2CreateCommand(req));
+		}
 		return super.getCreateCommand(req);
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment3CanonicalEditPolicy.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/StateStateCompartment3CanonicalEditPolicy.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment3CanonicalEditPolicy.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/StateStateCompartment3CanonicalEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -24,8 +24,9 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.scxml.modeling.ModelingPackage;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Anchor2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModel2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Finalize2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.InitialState2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeEditPart;
@@ -76,9 +77,10 @@ public class StateStateCompartment3Canon
 		case InitialState2EditPart.VISUAL_ID:
 		case HistoryStateEditPart.VISUAL_ID:
 		case Parallel2EditPart.VISUAL_ID:
-		case Anchor2EditPart.VISUAL_ID:
 		case FinalState2EditPart.VISUAL_ID:
 		case State3EditPart.VISUAL_ID:
+		case DataModel2EditPart.VISUAL_ID:
+		case Finalize2EditPart.VISUAL_ID:
 			if (!semanticChildren.contains(view.getElement())) {
 				return true;
 			}
@@ -112,11 +114,13 @@ public class StateStateCompartment3Canon
 			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_SubParallel());
 			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
-					.getState_Anchor());
-			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_FinalState());
 			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_SubState());
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getNamedElement_DataModel());
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getState_Finalize());
 		}
 		return myFeaturesToSynchronize;
 	}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment3ItemSemanticEditPolicy.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/StateStateCompartment3ItemSemanticEditPolicy.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartment3ItemSemanticEditPolicy.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/StateStateCompartment3ItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -18,7 +18,9 @@ package org.apache.commons.scxml.modelin
 
 import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Anchor2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.DataModel2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.FinalState2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Finalize2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.HistoryStateCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.InitialState2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.InvokeCreateCommand;
@@ -82,13 +84,6 @@ public class StateStateCompartment3ItemS
 			}
 			return getGEFWrapper(new Parallel2CreateCommand(req));
 		}
-		if (ModelingElementTypes.Anchor_3039 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ModelingPackage.eINSTANCE
-						.getState_Anchor());
-			}
-			return getGEFWrapper(new Anchor2CreateCommand(req));
-		}
 		if (ModelingElementTypes.FinalState_3040 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
@@ -103,6 +98,20 @@ public class StateStateCompartment3ItemS
 			}
 			return getGEFWrapper(new State3CreateCommand(req));
 		}
+		if (ModelingElementTypes.DataModel_3063 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getNamedElement_DataModel());
+			}
+			return getGEFWrapper(new DataModel2CreateCommand(req));
+		}
+		if (ModelingElementTypes.Finalize_3064 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getState_Finalize());
+			}
+			return getGEFWrapper(new Finalize2CreateCommand(req));
+		}
 		return super.getCreateCommand(req);
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartmentCanonicalEditPolicy.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/StateStateCompartmentCanonicalEditPolicy.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartmentCanonicalEditPolicy.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/StateStateCompartmentCanonicalEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -24,8 +24,9 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.scxml.modeling.ModelingPackage;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Anchor2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModel2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Finalize2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.InitialState2EditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeEditPart;
@@ -76,9 +77,10 @@ public class StateStateCompartmentCanoni
 		case InitialState2EditPart.VISUAL_ID:
 		case HistoryStateEditPart.VISUAL_ID:
 		case Parallel2EditPart.VISUAL_ID:
-		case Anchor2EditPart.VISUAL_ID:
 		case FinalState2EditPart.VISUAL_ID:
 		case State3EditPart.VISUAL_ID:
+		case DataModel2EditPart.VISUAL_ID:
+		case Finalize2EditPart.VISUAL_ID:
 			if (!semanticChildren.contains(view.getElement())) {
 				return true;
 			}
@@ -112,11 +114,13 @@ public class StateStateCompartmentCanoni
 			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_SubParallel());
 			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
-					.getState_Anchor());
-			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_FinalState());
 			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
 					.getState_SubState());
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getNamedElement_DataModel());
+			myFeaturesToSynchronize.add(ModelingPackage.eINSTANCE
+					.getState_Finalize());
 		}
 		return myFeaturesToSynchronize;
 	}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartmentItemSemanticEditPolicy.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/StateStateCompartmentItemSemanticEditPolicy.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/StateStateCompartmentItemSemanticEditPolicy.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/StateStateCompartmentItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -18,7 +18,9 @@ package org.apache.commons.scxml.modelin
 
 import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.Anchor2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.DataModel2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.FinalState2CreateCommand;
+import org.apache.commons.scxml.modeling.diagram.edit.commands.Finalize2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.HistoryStateCreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.InitialState2CreateCommand;
 import org.apache.commons.scxml.modeling.diagram.edit.commands.InvokeCreateCommand;
@@ -82,13 +84,6 @@ public class StateStateCompartmentItemSe
 			}
 			return getGEFWrapper(new Parallel2CreateCommand(req));
 		}
-		if (ModelingElementTypes.Anchor_3039 == req.getElementType()) {
-			if (req.getContainmentFeature() == null) {
-				req.setContainmentFeature(ModelingPackage.eINSTANCE
-						.getState_Anchor());
-			}
-			return getGEFWrapper(new Anchor2CreateCommand(req));
-		}
 		if (ModelingElementTypes.FinalState_3040 == req.getElementType()) {
 			if (req.getContainmentFeature() == null) {
 				req.setContainmentFeature(ModelingPackage.eINSTANCE
@@ -103,6 +98,20 @@ public class StateStateCompartmentItemSe
 			}
 			return getGEFWrapper(new State3CreateCommand(req));
 		}
+		if (ModelingElementTypes.DataModel_3063 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getNamedElement_DataModel());
+			}
+			return getGEFWrapper(new DataModel2CreateCommand(req));
+		}
+		if (ModelingElementTypes.Finalize_3064 == req.getElementType()) {
+			if (req.getContainmentFeature() == null) {
+				req.setContainmentFeature(ModelingPackage.eINSTANCE
+						.getState_Finalize());
+			}
+			return getGEFWrapper(new Finalize2CreateCommand(req));
+		}
 		return super.getCreateCommand(req);
 	}
 

Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/Validate3ItemSemanticEditPolicy.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/Validate3ItemSemanticEditPolicy.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/Validate3ItemSemanticEditPolicy.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/policies/Validate3ItemSemanticEditPolicy.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.scxml.modeling.diagram.edit.policies;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.commands.CompoundCommand;
+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+
+/**
+ * @generated
+ */
+public class Validate3ItemSemanticEditPolicy extends
+		ModelingBaseItemSemanticEditPolicy {
+
+	/**
+	 * @generated
+	 */
+	protected Command getDestroyElementCommand(DestroyElementRequest req) {
+		CompoundCommand cc = getDestroyEdgesCommand();
+		addDestroyShortcutsCommand(cc);
+		cc.add(getGEFWrapper(new DestroyElementCommand(req)));
+		return cc.unwrap();
+	}
+
+}

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

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ModelingNavigatorContentProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ModelingNavigatorContentProvider.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ModelingNavigatorContentProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ModelingNavigatorContentProvider.java Tue Jul  6 15:09:51 2010
@@ -22,90 +22,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 
-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;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.CancelEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Content2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Content3EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Content4EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Content5EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment3EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment4EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment5EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.DataDataCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.DataEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelDataModelCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.DonedataDonedataCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.DonedataEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ElseEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ElseIfEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContentEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalState2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateFinalStateCompartment2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalStateFinalStateCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryState2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.HistoryStateEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.If2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.IfEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.IfIfCompartment2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.IfIfCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.InitialState2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.InvokeInvokeCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Log2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.LogEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntry2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntry3EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryOnEntryCompartment2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryOnEntryCompartment3EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.OnEntryOnEntryCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExit2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExit3EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitOnExitCompartment2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitOnExitCompartment3EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.OnExitOnExitCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Parallel3EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartment2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartment3EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ParallelParallelCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Param2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Param3EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Param4EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Param5EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ParamEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Raise2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.RaiseEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Script2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Script3EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ScriptEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.Send2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.SendEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.SendSendCompartment2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.SendSendCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.ServiceTemplateEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.State2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.State3EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.StateEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartment2EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartment3EditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.StateStateCompartmentEditPart;
-import org.apache.commons.scxml.modeling.diagram.edit.parts.TransitionEditPart;
-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.edit.parts.*;
 import org.apache.commons.scxml.modeling.diagram.part.Messages;
 import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.core.resources.IFile;
@@ -392,19 +309,25 @@ public class ModelingNavigatorContentPro
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					StateStateCompartmentEditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					Anchor2EditPart.VISUAL_ID);
+					FinalState2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					StateStateCompartmentEditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					FinalState2EditPart.VISUAL_ID);
+					State3EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					StateStateCompartmentEditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					State3EditPart.VISUAL_ID);
+					DataModel2EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					StateStateCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Finalize2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getIncomingLinksByType(
@@ -442,31 +365,43 @@ public class ModelingNavigatorContentPro
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartment3EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					AnchorEditPart.VISUAL_ID);
+					Parallel3EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartment3EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					Parallel3EditPart.VISUAL_ID);
+					OnEntry2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartment3EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					OnEntry2EditPart.VISUAL_ID);
+					OnExit2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartment3EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					OnExit2EditPart.VISUAL_ID);
+					State2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartment3EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					State2EditPart.VISUAL_ID);
+					DataModel2EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					ParallelParallelCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Invoke2EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					ParallelParallelCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Finalize3EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getIncomingLinksByType(
@@ -625,28 +560,28 @@ public class ModelingNavigatorContentPro
 			return result.toArray();
 		}
 
-		case SendEditPart.VISUAL_ID: {
+		case RaiseEditPart.VISUAL_ID: {
 			Collection result = new ArrayList();
 			Collection connectedViews = getChildrenByType(Collections
-					.singleton(view), SendSendCompartmentEditPart.VISUAL_ID);
+					.singleton(view), RaiseRaiseCompartmentEditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					ParamEditPart.VISUAL_ID);
+					Param6EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
-					SendSendCompartmentEditPart.VISUAL_ID);
+					RaiseRaiseCompartmentEditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					ContentEditPart.VISUAL_ID);
+					Content6EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			return result.toArray();
 		}
 
-		case ContentEditPart.VISUAL_ID: {
+		case Content6EditPart.VISUAL_ID: {
 			Collection result = new ArrayList();
 			Collection connectedViews = getChildrenByType(Collections
 					.singleton(view),
-					ContentContentCompartmentEditPart.VISUAL_ID);
+					ContentContentCompartment6EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
 					Content2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
@@ -666,6 +601,35 @@ public class ModelingNavigatorContentPro
 			return result.toArray();
 		}
 
+		case SendEditPart.VISUAL_ID: {
+			Collection result = new ArrayList();
+			Collection connectedViews = getChildrenByType(Collections
+					.singleton(view), SendSendCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ParamEditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					SendSendCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ContentEditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			return result.toArray();
+		}
+
+		case ContentEditPart.VISUAL_ID: {
+			Collection result = new ArrayList();
+			Collection connectedViews = getChildrenByType(Collections
+					.singleton(view),
+					ContentContentCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Content2EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			return result.toArray();
+		}
+
 		case OnExitEditPart.VISUAL_ID: {
 			Collection result = new ArrayList();
 			Collection connectedViews = getChildrenByType(Collections
@@ -748,6 +712,23 @@ public class ModelingNavigatorContentPro
 			return result.toArray();
 		}
 
+		case Raise2EditPart.VISUAL_ID: {
+			Collection result = new ArrayList();
+			Collection connectedViews = getChildrenByType(Collections
+					.singleton(view), RaiseRaiseCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Param6EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					RaiseRaiseCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Content6EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			return result.toArray();
+		}
+
 		case Send2EditPart.VISUAL_ID: {
 			Collection result = new ArrayList();
 			Collection connectedViews = getChildrenByType(Collections
@@ -788,6 +769,123 @@ public class ModelingNavigatorContentPro
 			return result.toArray();
 		}
 
+		case FinalizeEditPart.VISUAL_ID: {
+			Collection result = new ArrayList();
+			Collection connectedViews = getChildrenByType(Collections
+					.singleton(view),
+					FinalizeFinalizeCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					If3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Assign3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Raise3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Log3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Validate3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Cancel3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Send3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Param7EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Script4EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ExtenExecContent3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			return result.toArray();
+		}
+
+		case If3EditPart.VISUAL_ID: {
+			Collection result = new ArrayList();
+			Collection connectedViews = getChildrenByType(Collections
+					.singleton(view), IfIfCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ElseIfEditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					IfIfCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ElseEditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			return result.toArray();
+		}
+
+		case Raise3EditPart.VISUAL_ID: {
+			Collection result = new ArrayList();
+			Collection connectedViews = getChildrenByType(Collections
+					.singleton(view), RaiseRaiseCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Param6EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					RaiseRaiseCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Content6EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			return result.toArray();
+		}
+
+		case Send3EditPart.VISUAL_ID: {
+			Collection result = new ArrayList();
+			Collection connectedViews = getChildrenByType(Collections
+					.singleton(view), SendSendCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ParamEditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					SendSendCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ContentEditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			return result.toArray();
+		}
+
 		case Content3EditPart.VISUAL_ID: {
 			Collection result = new ArrayList();
 			Collection connectedViews = getChildrenByType(Collections
@@ -868,31 +966,43 @@ public class ModelingNavigatorContentPro
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartmentEditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					AnchorEditPart.VISUAL_ID);
+					Parallel3EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartmentEditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					Parallel3EditPart.VISUAL_ID);
+					OnEntry2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartmentEditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					OnEntry2EditPart.VISUAL_ID);
+					OnExit2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartmentEditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					OnExit2EditPart.VISUAL_ID);
+					State2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartmentEditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					State2EditPart.VISUAL_ID);
+					DataModel2EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					ParallelParallelCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Invoke2EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					ParallelParallelCompartmentEditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Finalize3EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getIncomingLinksByType(
@@ -955,31 +1065,43 @@ public class ModelingNavigatorContentPro
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartment2EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					AnchorEditPart.VISUAL_ID);
+					Parallel3EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartment2EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					Parallel3EditPart.VISUAL_ID);
+					OnEntry2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartment2EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					OnEntry2EditPart.VISUAL_ID);
+					OnExit2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartment2EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					OnExit2EditPart.VISUAL_ID);
+					State2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					ParallelParallelCompartment2EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					State2EditPart.VISUAL_ID);
+					DataModel2EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					ParallelParallelCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Invoke2EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					ParallelParallelCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Finalize3EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getIncomingLinksByType(
@@ -1178,19 +1300,25 @@ public class ModelingNavigatorContentPro
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					StateStateCompartment2EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					Anchor2EditPart.VISUAL_ID);
+					FinalState2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					StateStateCompartment2EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					FinalState2EditPart.VISUAL_ID);
+					State3EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					StateStateCompartment2EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					State3EditPart.VISUAL_ID);
+					DataModel2EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					StateStateCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Finalize2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getIncomingLinksByType(
@@ -1463,19 +1591,25 @@ public class ModelingNavigatorContentPro
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					StateStateCompartment3EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					Anchor2EditPart.VISUAL_ID);
+					FinalState2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					StateStateCompartment3EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					FinalState2EditPart.VISUAL_ID);
+					State3EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getChildrenByType(Collections.singleton(view),
 					StateStateCompartment3EditPart.VISUAL_ID);
 			connectedViews = getChildrenByType(connectedViews,
-					State3EditPart.VISUAL_ID);
+					DataModel2EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					StateStateCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Finalize2EditPart.VISUAL_ID);
 			result.addAll(createNavigatorItems(connectedViews, parentElement,
 					false));
 			connectedViews = getIncomingLinksByType(
@@ -1495,6 +1629,18 @@ public class ModelingNavigatorContentPro
 			return result.toArray();
 		}
 
+		case DataModel2EditPart.VISUAL_ID: {
+			Collection result = new ArrayList();
+			Collection connectedViews = getChildrenByType(Collections
+					.singleton(view),
+					DataModelDataModelCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					DataEditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			return result.toArray();
+		}
+
 		case DataEditPart.VISUAL_ID: {
 			Collection result = new ArrayList();
 			Collection connectedViews = getChildrenByType(Collections
@@ -1518,6 +1664,162 @@ public class ModelingNavigatorContentPro
 			return result.toArray();
 		}
 
+		case Finalize2EditPart.VISUAL_ID: {
+			Collection result = new ArrayList();
+			Collection connectedViews = getChildrenByType(Collections
+					.singleton(view),
+					FinalizeFinalizeCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					If3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Assign3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Raise3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Log3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Validate3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Cancel3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Send3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Param7EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Script4EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ExtenExecContent3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			return result.toArray();
+		}
+
+		case Invoke2EditPart.VISUAL_ID: {
+			Collection result = new ArrayList();
+			Collection connectedViews = getChildrenByType(Collections
+					.singleton(view),
+					InvokeInvokeCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					FinalizeEditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					InvokeInvokeCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Param4EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					InvokeInvokeCompartment2EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Content3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			return result.toArray();
+		}
+
+		case Finalize3EditPart.VISUAL_ID: {
+			Collection result = new ArrayList();
+			Collection connectedViews = getChildrenByType(Collections
+					.singleton(view),
+					FinalizeFinalizeCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					If3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Assign3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Raise3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Log3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Validate3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Cancel3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Send3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Param7EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					Script4EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			connectedViews = getChildrenByType(Collections.singleton(view),
+					FinalizeFinalizeCompartment3EditPart.VISUAL_ID);
+			connectedViews = getChildrenByType(connectedViews,
+					ExtenExecContent3EditPart.VISUAL_ID);
+			result.addAll(createNavigatorItems(connectedViews, parentElement,
+					false));
+			return result.toArray();
+		}
+
 		case TransitionEditPart.VISUAL_ID: {
 			Collection result = new ArrayList();
 			ModelingNavigatorGroup target = new ModelingNavigatorGroup(

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ModelingNavigatorLabelProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ModelingNavigatorLabelProvider.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ModelingNavigatorLabelProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ModelingNavigatorLabelProvider.java Tue Jul  6 15:09:51 2010
@@ -16,6 +16,7 @@
  */
 package org.apache.commons.scxml.modeling.diagram.navigator;
 
+import org.apache.commons.scxml.modeling.Content;
 import org.apache.commons.scxml.modeling.ServiceTemplate;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.*;
 import org.apache.commons.scxml.modeling.diagram.part.ModelingDiagramEditorPlugin;
@@ -136,6 +137,15 @@ public class ModelingNavigatorLabelProvi
 		case RaiseEditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?Raise", ModelingElementTypes.Raise_3006); //$NON-NLS-1$
+		case Param6EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?Param", ModelingElementTypes.Param_3051); //$NON-NLS-1$
+		case Content6EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?Content", ModelingElementTypes.Content_3052); //$NON-NLS-1$
+		case Content2EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?Content", ModelingElementTypes.Content_3013); //$NON-NLS-1$
 		case LogEditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?Log", ModelingElementTypes.Log_3007); //$NON-NLS-1$
@@ -154,9 +164,6 @@ public class ModelingNavigatorLabelProvi
 		case ContentEditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?Content", ModelingElementTypes.Content_3012); //$NON-NLS-1$
-		case Content2EditPart.VISUAL_ID:
-			return getImage(
-					"Navigator?Node?org.apache.commons.scxml?Content", ModelingElementTypes.Content_3013); //$NON-NLS-1$
 		case Param2EditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?Param", ModelingElementTypes.Param_3014); //$NON-NLS-1$
@@ -205,6 +212,36 @@ public class ModelingNavigatorLabelProvi
 		case FinalizeEditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?Finalize", ModelingElementTypes.Finalize_3027); //$NON-NLS-1$
+		case If3EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?If", ModelingElementTypes.If_3053); //$NON-NLS-1$
+		case Assign3EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?Assign", ModelingElementTypes.Assign_3054); //$NON-NLS-1$
+		case Raise3EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?Raise", ModelingElementTypes.Raise_3055); //$NON-NLS-1$
+		case Log3EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?Log", ModelingElementTypes.Log_3056); //$NON-NLS-1$
+		case Validate3EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?Validate", ModelingElementTypes.Validate_3057); //$NON-NLS-1$
+		case Cancel3EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?Cancel", ModelingElementTypes.Cancel_3058); //$NON-NLS-1$
+		case Send3EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?Send", ModelingElementTypes.Send_3059); //$NON-NLS-1$
+		case Param7EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?Param", ModelingElementTypes.Param_3060); //$NON-NLS-1$
+		case Script4EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?Script", ModelingElementTypes.Script_3061); //$NON-NLS-1$
+		case ExtenExecContent3EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?ExtenExecContent", ModelingElementTypes.ExtenExecContent_3062); //$NON-NLS-1$
 		case Param4EditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?Param", ModelingElementTypes.Param_3028); //$NON-NLS-1$
@@ -223,9 +260,6 @@ public class ModelingNavigatorLabelProvi
 		case HistoryState2EditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?HistoryState", ModelingElementTypes.HistoryState_3033); //$NON-NLS-1$
-		case AnchorEditPart.VISUAL_ID:
-			return getImage(
-					"Navigator?Node?org.apache.commons.scxml?Anchor", ModelingElementTypes.Anchor_3034); //$NON-NLS-1$
 		case Parallel3EditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?Parallel", ModelingElementTypes.Parallel_3035); //$NON-NLS-1$
@@ -238,9 +272,6 @@ public class ModelingNavigatorLabelProvi
 		case State2EditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?State", ModelingElementTypes.State_3038); //$NON-NLS-1$
-		case Anchor2EditPart.VISUAL_ID:
-			return getImage(
-					"Navigator?Node?org.apache.commons.scxml?Anchor", ModelingElementTypes.Anchor_3039); //$NON-NLS-1$
 		case FinalState2EditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?FinalState", ModelingElementTypes.FinalState_3040); //$NON-NLS-1$
@@ -262,12 +293,24 @@ public class ModelingNavigatorLabelProvi
 		case State3EditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?State", ModelingElementTypes.State_3046); //$NON-NLS-1$
+		case DataModel2EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?DataModel", ModelingElementTypes.DataModel_3063); //$NON-NLS-1$
 		case DataEditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?Data", ModelingElementTypes.Data_3047); //$NON-NLS-1$
 		case Content5EditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Node?org.apache.commons.scxml?Content", ModelingElementTypes.Content_3048); //$NON-NLS-1$
+		case Finalize2EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?Finalize", ModelingElementTypes.Finalize_3064); //$NON-NLS-1$
+		case Invoke2EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?Invoke", ModelingElementTypes.Invoke_3065); //$NON-NLS-1$
+		case Finalize3EditPart.VISUAL_ID:
+			return getImage(
+					"Navigator?Node?org.apache.commons.scxml?Finalize", ModelingElementTypes.Finalize_3066); //$NON-NLS-1$
 		case TransitionEditPart.VISUAL_ID:
 			return getImage(
 					"Navigator?Link?org.apache.commons.scxml?Transition", ModelingElementTypes.Transition_4001); //$NON-NLS-1$
@@ -347,6 +390,12 @@ public class ModelingNavigatorLabelProvi
 			return getAssign_3005Text(view);
 		case RaiseEditPart.VISUAL_ID:
 			return getRaise_3006Text(view);
+		case Param6EditPart.VISUAL_ID:
+			return getParam_3051Text(view);
+		case Content6EditPart.VISUAL_ID:
+			return getContent_3052Text(view);
+		case Content2EditPart.VISUAL_ID:
+			return getContent_3013Text(view);
 		case LogEditPart.VISUAL_ID:
 			return getLog_3007Text(view);
 		case ValidateEditPart.VISUAL_ID:
@@ -359,8 +408,6 @@ public class ModelingNavigatorLabelProvi
 			return getParam_3011Text(view);
 		case ContentEditPart.VISUAL_ID:
 			return getContent_3012Text(view);
-		case Content2EditPart.VISUAL_ID:
-			return getContent_3013Text(view);
 		case Param2EditPart.VISUAL_ID:
 			return getParam_3014Text(view);
 		case Script2EditPart.VISUAL_ID:
@@ -393,6 +440,26 @@ public class ModelingNavigatorLabelProvi
 			return getInvoke_3026Text(view);
 		case FinalizeEditPart.VISUAL_ID:
 			return getFinalize_3027Text(view);
+		case If3EditPart.VISUAL_ID:
+			return getIf_3053Text(view);
+		case Assign3EditPart.VISUAL_ID:
+			return getAssign_3054Text(view);
+		case Raise3EditPart.VISUAL_ID:
+			return getRaise_3055Text(view);
+		case Log3EditPart.VISUAL_ID:
+			return getLog_3056Text(view);
+		case Validate3EditPart.VISUAL_ID:
+			return getValidate_3057Text(view);
+		case Cancel3EditPart.VISUAL_ID:
+			return getCancel_3058Text(view);
+		case Send3EditPart.VISUAL_ID:
+			return getSend_3059Text(view);
+		case Param7EditPart.VISUAL_ID:
+			return getParam_3060Text(view);
+		case Script4EditPart.VISUAL_ID:
+			return getScript_3061Text(view);
+		case ExtenExecContent3EditPart.VISUAL_ID:
+			return getExtenExecContent_3062Text(view);
 		case Param4EditPart.VISUAL_ID:
 			return getParam_3028Text(view);
 		case Content3EditPart.VISUAL_ID:
@@ -405,8 +472,6 @@ public class ModelingNavigatorLabelProvi
 			return getParallel_3032Text(view);
 		case HistoryState2EditPart.VISUAL_ID:
 			return getHistoryState_3033Text(view);
-		case AnchorEditPart.VISUAL_ID:
-			return getAnchor_3034Text(view);
 		case Parallel3EditPart.VISUAL_ID:
 			return getParallel_3035Text(view);
 		case OnEntry2EditPart.VISUAL_ID:
@@ -415,8 +480,6 @@ public class ModelingNavigatorLabelProvi
 			return getOnExit_3037Text(view);
 		case State2EditPart.VISUAL_ID:
 			return getState_3038Text(view);
-		case Anchor2EditPart.VISUAL_ID:
-			return getAnchor_3039Text(view);
 		case FinalState2EditPart.VISUAL_ID:
 			return getFinalState_3040Text(view);
 		case DonedataEditPart.VISUAL_ID:
@@ -431,10 +494,18 @@ public class ModelingNavigatorLabelProvi
 			return getOnExit_3045Text(view);
 		case State3EditPart.VISUAL_ID:
 			return getState_3046Text(view);
+		case DataModel2EditPart.VISUAL_ID:
+			return getDataModel_3063Text(view);
 		case DataEditPart.VISUAL_ID:
 			return getData_3047Text(view);
 		case Content5EditPart.VISUAL_ID:
 			return getContent_3048Text(view);
+		case Finalize2EditPart.VISUAL_ID:
+			return getFinalize_3064Text(view);
+		case Invoke2EditPart.VISUAL_ID:
+			return getInvoke_3065Text(view);
+		case Finalize3EditPart.VISUAL_ID:
+			return getFinalize_3066Text(view);
 		case TransitionEditPart.VISUAL_ID:
 			return getTransition_4001Text(view);
 		}
@@ -690,6 +761,41 @@ public class ModelingNavigatorLabelProvi
 	/**
 	 * @generated
 	 */
+	private String getParam_3051Text(View view) {
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.Param_3051,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry.getType(ParamName6EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"Parser was not found for label " + 5054); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
+	private String getContent_3052Text(View view) {
+		Content domainModelElement = (Content) view.getElement();
+		if (domainModelElement != null) {
+			return domainModelElement.getText_content();
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"No domain element for view with visualID = " + 3052); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * @generated
+	 */
 	private String getLog_3007Text(View view) {
 		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
 				ModelingElementTypes.Log_3007,
@@ -798,14 +904,28 @@ public class ModelingNavigatorLabelProvi
 	 * @generated
 	 */
 	private String getContent_3012Text(View view) {
-		return ""; //$NON-NLS-1$
+		Content domainModelElement = (Content) view.getElement();
+		if (domainModelElement != null) {
+			return domainModelElement.getText_content();
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"No domain element for view with visualID = " + 3012); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
 	}
 
 	/**
 	 * @generated
 	 */
 	private String getContent_3013Text(View view) {
-		return ""; //$NON-NLS-1$
+		Content domainModelElement = (Content) view.getElement();
+		if (domainModelElement != null) {
+			return domainModelElement.getText_content();
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"No domain element for view with visualID = " + 3013); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
 	}
 
 	/**
@@ -1144,6 +1264,217 @@ public class ModelingNavigatorLabelProvi
 	/**
 	 * @generated
 	 */
+	private String getIf_3053Text(View view) {
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.If_3053, (view.getElement() != null ? view
+						.getElement() : view), ModelingVisualIDRegistry
+						.getType(IfCond3EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"Parser was not found for label " + 5055); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
+	private String getAssign_3054Text(View view) {
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.Assign_3054,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry
+						.getType(AssignDataid3EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"Parser was not found for label " + 5056); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
+	private String getRaise_3055Text(View view) {
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.Raise_3055,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry.getType(RaiseEvent3EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"Parser was not found for label " + 5057); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
+	private String getLog_3056Text(View view) {
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.Log_3056,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry.getType(LogExpr3EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"Parser was not found for label " + 5058); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
+	private String getValidate_3057Text(View view) {
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.Validate_3057,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry
+						.getType(ValidateSchema3EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"Parser was not found for label " + 5059); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
+	private String getCancel_3058Text(View view) {
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.Cancel_3058,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry
+						.getType(CancelSendid3EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"Parser was not found for label " + 5060); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
+	private String getSend_3059Text(View view) {
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.Send_3059,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry.getType(SendEvent3EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"Parser was not found for label " + 5061); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
+	private String getParam_3060Text(View view) {
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.Param_3060,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry.getType(ParamName7EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"Parser was not found for label " + 5062); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
+	private String getScript_3061Text(View view) {
+
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.Script_3061,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry
+						.getType(WrappingLabelEditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
+	private String getExtenExecContent_3062Text(View view) {
+
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.ExtenExecContent_3062,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry
+						.getType(WrappingLabel17EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
 	private String getParam_3028Text(View view) {
 		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
 				ModelingElementTypes.Param_3028,
@@ -1166,7 +1497,14 @@ public class ModelingNavigatorLabelProvi
 	 * @generated
 	 */
 	private String getContent_3029Text(View view) {
-		return ""; //$NON-NLS-1$
+		Content domainModelElement = (Content) view.getElement();
+		if (domainModelElement != null) {
+			return domainModelElement.getText_content();
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"No domain element for view with visualID = " + 3029); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
 	}
 
 	/**
@@ -1257,27 +1595,6 @@ public class ModelingNavigatorLabelProvi
 	/**
 	 * @generated
 	 */
-	private String getAnchor_3034Text(View view) {
-		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
-				ModelingElementTypes.Anchor_3034,
-				(view.getElement() != null ? view.getElement() : view),
-				ModelingVisualIDRegistry.getType(AnchorTypeEditPart.VISUAL_ID));
-		IParser parser = ParserService.getInstance().getParser(hintAdapter);
-
-		if (parser != null) {
-			return parser.getPrintString(hintAdapter, ParserOptions.NONE
-					.intValue());
-		} else {
-			ModelingDiagramEditorPlugin.getInstance().logError(
-					"Parser was not found for label " + 5032); //$NON-NLS-1$
-			return ""; //$NON-NLS-1$
-		}
-
-	}
-
-	/**
-	 * @generated
-	 */
 	private String getParallel_3035Text(View view) {
 		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
 				ModelingElementTypes.Parallel_3035,
@@ -1360,27 +1677,6 @@ public class ModelingNavigatorLabelProvi
 	/**
 	 * @generated
 	 */
-	private String getAnchor_3039Text(View view) {
-		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
-				ModelingElementTypes.Anchor_3039,
-				(view.getElement() != null ? view.getElement() : view),
-				ModelingVisualIDRegistry.getType(AnchorType2EditPart.VISUAL_ID));
-		IParser parser = ParserService.getInstance().getParser(hintAdapter);
-
-		if (parser != null) {
-			return parser.getPrintString(hintAdapter, ParserOptions.NONE
-					.intValue());
-		} else {
-			ModelingDiagramEditorPlugin.getInstance().logError(
-					"Parser was not found for label " + 5035); //$NON-NLS-1$
-			return ""; //$NON-NLS-1$
-		}
-
-	}
-
-	/**
-	 * @generated
-	 */
 	private String getFinalState_3040Text(View view) {
 		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
 				ModelingElementTypes.FinalState_3040,
@@ -1445,7 +1741,14 @@ public class ModelingNavigatorLabelProvi
 	 * @generated
 	 */
 	private String getContent_3043Text(View view) {
-		return ""; //$NON-NLS-1$
+		Content domainModelElement = (Content) view.getElement();
+		if (domainModelElement != null) {
+			return domainModelElement.getText_content();
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"No domain element for view with visualID = " + 3043); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
 	}
 
 	/**
@@ -1512,6 +1815,28 @@ public class ModelingNavigatorLabelProvi
 	/**
 	 * @generated
 	 */
+	private String getDataModel_3063Text(View view) {
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.DataModel_3063,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry
+						.getType(DataModelSchema2EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"Parser was not found for label " + 5065); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
 	private String getData_3047Text(View view) {
 		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
 				ModelingElementTypes.Data_3047,
@@ -1534,7 +1859,75 @@ public class ModelingNavigatorLabelProvi
 	 * @generated
 	 */
 	private String getContent_3048Text(View view) {
-		return ""; //$NON-NLS-1$
+		Content domainModelElement = (Content) view.getElement();
+		if (domainModelElement != null) {
+			return domainModelElement.getText_content();
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"No domain element for view with visualID = " + 3048); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private String getFinalize_3064Text(View view) {
+
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.Finalize_3064,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry
+						.getType(WrappingLabel18EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
+	private String getInvoke_3065Text(View view) {
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.Invoke_3065,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry.getType(InvokeType2EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			ModelingDiagramEditorPlugin.getInstance().logError(
+					"Parser was not found for label " + 5067); //$NON-NLS-1$
+			return ""; //$NON-NLS-1$
+		}
+
+	}
+
+	/**
+	 * @generated
+	 */
+	private String getFinalize_3066Text(View view) {
+
+		IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+				ModelingElementTypes.Finalize_3066,
+				(view.getElement() != null ? view.getElement() : view),
+				ModelingVisualIDRegistry
+						.getType(WrappingLabel19EditPart.VISUAL_ID));
+		IParser parser = ParserService.getInstance().getParser(hintAdapter);
+		if (parser != null) {
+			return parser.getPrintString(hintAdapter, ParserOptions.NONE
+					.intValue());
+		} else {
+			return ""; //$NON-NLS-1$
+		}
+
 	}
 
 	/**

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ModelingNavigatorSorter.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ModelingNavigatorSorter.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ModelingNavigatorSorter.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/navigator/ModelingNavigatorSorter.java Tue Jul  6 15:09:51 2010
@@ -27,7 +27,7 @@ public class ModelingNavigatorSorter ext
 	/**
 	 * @generated
 	 */
-	private static final int GROUP_CATEGORY = 7029;
+	private static final int GROUP_CATEGORY = 7040;
 
 	/**
 	 * @generated



Mime
View raw message