commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gu...@apache.org
Subject svn commit: r945691 [7/39] - in /commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src: main/java/org.apache.commons.scxml.diagram/ main/java/org.apache.commons.scxml.diagram/META-INF/ main/java/org.apache.commons.scxml.diagram/icons/obj16/ main/java/org.a...
Date Tue, 18 May 2010 15:13:31 GMT
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InitialState2EditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InitialState2EditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InitialState2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InitialState2EditPart.java Tue May 18 15:13:13 2010
@@ -1,23 +1,7 @@
-/*
- * 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.parts;
 
 import org.apache.commons.scxml.modeling.diagram.edit.policies.InitialState2ItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.draw2d.Ellipse;
 import org.eclipse.draw2d.FlowLayout;
 import org.eclipse.draw2d.IFigure;
@@ -218,7 +202,7 @@ public class InitialState2EditPart exten
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(ScxmlVisualIDRegistry
+		return getChildBySemanticHint(ModelingVisualIDRegistry
 				.getType(WrappingLabel9EditPart.VISUAL_ID));
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InitialStateEditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InitialStateEditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InitialStateEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InitialStateEditPart.java Tue May 18 15:13:13 2010
@@ -1,23 +1,7 @@
-/*
- * 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.parts;
 
 import org.apache.commons.scxml.modeling.diagram.edit.policies.InitialStateItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.draw2d.Ellipse;
 import org.eclipse.draw2d.FlowLayout;
 import org.eclipse.draw2d.IFigure;
@@ -218,7 +202,7 @@ public class InitialStateEditPart extend
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(ScxmlVisualIDRegistry
+		return getChildBySemanticHint(ModelingVisualIDRegistry
 				.getType(WrappingLabelEditPart.VISUAL_ID));
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InvokeEditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InvokeEditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InvokeEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InvokeEditPart.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * 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.parts;
 
 import org.apache.commons.scxml.modeling.diagram.edit.policies.InvokeItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.RoundedRectangle;
 import org.eclipse.draw2d.StackLayout;
@@ -87,7 +71,7 @@ public class InvokeEditPart extends Shap
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {
 					if (child instanceof ITextAwareEditPart) {
-						return new ScxmlTextSelectionEditPolicy();
+						return new ModelingTextSelectionEditPolicy();
 					}
 				}
 				return super.createChildEditPolicy(child);
@@ -214,7 +198,7 @@ public class InvokeEditPart extends Shap
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(ScxmlVisualIDRegistry
+		return getChildBySemanticHint(ModelingVisualIDRegistry
 				.getType(InvokeTypeEditPart.VISUAL_ID));
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InvokeInvokeCompartmentEditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InvokeInvokeCompartmentEditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InvokeInvokeCompartmentEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InvokeInvokeCompartmentEditPart.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.parts;
 
 import org.apache.commons.scxml.modeling.diagram.edit.policies.InvokeInvokeCompartmentCanonicalEditPolicy;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InvokeTypeEditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InvokeTypeEditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InvokeTypeEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/InvokeTypeEditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;
@@ -214,7 +198,7 @@ public class InvokeTypeEditPart extends 
 		if (parserElement == null) {
 			return null;
 		}
-		return ScxmlElementTypes.getImage(parserElement.eClass());
+		return ModelingElementTypes.getImage(parserElement.eClass());
 	}
 
 	/**
@@ -240,8 +224,8 @@ public class InvokeTypeEditPart extends 
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 
@@ -321,8 +305,8 @@ public class InvokeTypeEditPart extends 
 	public IParser getParser() {
 		if (parser == null) {
 			String parserHint = ((View) getModel()).getType();
-			IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
-					ScxmlElementTypes.Invoke_2026, getParserElement(),
+			IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+					ModelingElementTypes.Invoke_2026, getParserElement(),
 					parserHint);
 			parser = ParserService.getInstance().getParser(hintAdapter);
 		}
@@ -335,7 +319,7 @@ public class InvokeTypeEditPart extends 
 	protected DirectEditManager getManager() {
 		if (manager == null) {
 			setManager(new TextDirectEditManager(this, TextDirectEditManager
-					.getTextCellEditorClass(this), ScxmlEditPartFactory
+					.getTextCellEditorClass(this), ModelingEditPartFactory
 					.getTextCellEditorLocator(this)));
 		}
 		return manager;
@@ -429,8 +413,8 @@ public class InvokeTypeEditPart extends 
 		setLabelTextHelper(getFigure(), getLabelText());
 		setLabelIconHelper(getFigure(), getLabelIcon());
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Log2EditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Log2EditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Log2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Log2EditPart.java Tue May 18 15:13:13 2010
@@ -1,23 +1,7 @@
-/*
- * 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.parts;
 
 import org.apache.commons.scxml.modeling.diagram.edit.policies.Log2ItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.draw2d.FlowLayout;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.RectangleFigure;
@@ -217,7 +201,7 @@ public class Log2EditPart extends ShapeN
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(ScxmlVisualIDRegistry
+		return getChildBySemanticHint(ModelingVisualIDRegistry
 				.getType(LogExpr2EditPart.VISUAL_ID));
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/LogEditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/LogEditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/LogEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/LogEditPart.java Tue May 18 15:13:13 2010
@@ -1,23 +1,7 @@
-/*
- * 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.parts;
 
 import org.apache.commons.scxml.modeling.diagram.edit.policies.LogItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.draw2d.FlowLayout;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.RectangleFigure;
@@ -217,7 +201,7 @@ public class LogEditPart extends ShapeNo
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(ScxmlVisualIDRegistry
+		return getChildBySemanticHint(ModelingVisualIDRegistry
 				.getType(LogExprEditPart.VISUAL_ID));
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/LogExpr2EditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/LogExpr2EditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/LogExpr2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/LogExpr2EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;
@@ -214,7 +198,7 @@ public class LogExpr2EditPart extends Co
 		if (parserElement == null) {
 			return null;
 		}
-		return ScxmlElementTypes.getImage(parserElement.eClass());
+		return ModelingElementTypes.getImage(parserElement.eClass());
 	}
 
 	/**
@@ -240,8 +224,8 @@ public class LogExpr2EditPart extends Co
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 
@@ -321,8 +305,9 @@ public class LogExpr2EditPart extends Co
 	public IParser getParser() {
 		if (parser == null) {
 			String parserHint = ((View) getModel()).getType();
-			IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
-					ScxmlElementTypes.Log_2020, getParserElement(), parserHint);
+			IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+					ModelingElementTypes.Log_2020, getParserElement(),
+					parserHint);
 			parser = ParserService.getInstance().getParser(hintAdapter);
 		}
 		return parser;
@@ -334,7 +319,7 @@ public class LogExpr2EditPart extends Co
 	protected DirectEditManager getManager() {
 		if (manager == null) {
 			setManager(new TextDirectEditManager(this, TextDirectEditManager
-					.getTextCellEditorClass(this), ScxmlEditPartFactory
+					.getTextCellEditorClass(this), ModelingEditPartFactory
 					.getTextCellEditorLocator(this)));
 		}
 		return manager;
@@ -428,8 +413,8 @@ public class LogExpr2EditPart extends Co
 		setLabelTextHelper(getFigure(), getLabelText());
 		setLabelIconHelper(getFigure(), getLabelIcon());
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/LogExprEditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/LogExprEditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/LogExprEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/LogExprEditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;
@@ -214,7 +198,7 @@ public class LogExprEditPart extends Com
 		if (parserElement == null) {
 			return null;
 		}
-		return ScxmlElementTypes.getImage(parserElement.eClass());
+		return ModelingElementTypes.getImage(parserElement.eClass());
 	}
 
 	/**
@@ -240,8 +224,8 @@ public class LogExprEditPart extends Com
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 
@@ -321,8 +305,9 @@ public class LogExprEditPart extends Com
 	public IParser getParser() {
 		if (parser == null) {
 			String parserHint = ((View) getModel()).getType();
-			IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
-					ScxmlElementTypes.Log_2007, getParserElement(), parserHint);
+			IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+					ModelingElementTypes.Log_2007, getParserElement(),
+					parserHint);
 			parser = ParserService.getInstance().getParser(hintAdapter);
 		}
 		return parser;
@@ -334,7 +319,7 @@ public class LogExprEditPart extends Com
 	protected DirectEditManager getManager() {
 		if (manager == null) {
 			setManager(new TextDirectEditManager(this, TextDirectEditManager
-					.getTextCellEditorClass(this), ScxmlEditPartFactory
+					.getTextCellEditorClass(this), ModelingEditPartFactory
 					.getTextCellEditorLocator(this)));
 		}
 		return manager;
@@ -428,8 +413,8 @@ public class LogExprEditPart extends Com
 		setLabelTextHelper(getFigure(), getLabelText());
 		setLabelIconHelper(getFigure(), getLabelIcon());
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 

Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ModelingEditPartFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ModelingEditPartFactory.java?rev=945691&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ModelingEditPartFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ModelingEditPartFactory.java Tue May 18 15:13:13 2010
@@ -0,0 +1,547 @@
+package org.apache.commons.scxml.modeling.diagram.edit.parts;
+
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.draw2d.FigureUtilities;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartFactory;
+import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * @generated
+ */
+public class ModelingEditPartFactory implements EditPartFactory {
+
+	/**
+	 * @generated
+	 */
+	public EditPart createEditPart(EditPart context, Object model) {
+		if (model instanceof View) {
+			View view = (View) model;
+			switch (ModelingVisualIDRegistry.getVisualID(view)) {
+
+			case ServiceTemplateEditPart.VISUAL_ID:
+				return new ServiceTemplateEditPart(view);
+
+			case StateEditPart.VISUAL_ID:
+				return new StateEditPart(view);
+
+			case StateIdEditPart.VISUAL_ID:
+				return new StateIdEditPart(view);
+
+			case InitialStateEditPart.VISUAL_ID:
+				return new InitialStateEditPart(view);
+
+			case WrappingLabelEditPart.VISUAL_ID:
+				return new WrappingLabelEditPart(view);
+
+			case ScriptEditPart.VISUAL_ID:
+				return new ScriptEditPart(view);
+
+			case WrappingLabel2EditPart.VISUAL_ID:
+				return new WrappingLabel2EditPart(view);
+
+			case ParallelEditPart.VISUAL_ID:
+				return new ParallelEditPart(view);
+
+			case ParallelIdEditPart.VISUAL_ID:
+				return new ParallelIdEditPart(view);
+
+			case DataModelEditPart.VISUAL_ID:
+				return new DataModelEditPart(view);
+
+			case DataModelSchemaEditPart.VISUAL_ID:
+				return new DataModelSchemaEditPart(view);
+
+			case FinalStateEditPart.VISUAL_ID:
+				return new FinalStateEditPart(view);
+
+			case FinalStateIdEditPart.VISUAL_ID:
+				return new FinalStateIdEditPart(view);
+
+			case OnEntryEditPart.VISUAL_ID:
+				return new OnEntryEditPart(view);
+
+			case WrappingLabel3EditPart.VISUAL_ID:
+				return new WrappingLabel3EditPart(view);
+
+			case IfEditPart.VISUAL_ID:
+				return new IfEditPart(view);
+
+			case IfCondEditPart.VISUAL_ID:
+				return new IfCondEditPart(view);
+
+			case ElseIfEditPart.VISUAL_ID:
+				return new ElseIfEditPart(view);
+
+			case ElseIfCondEditPart.VISUAL_ID:
+				return new ElseIfCondEditPart(view);
+
+			case ElseEditPart.VISUAL_ID:
+				return new ElseEditPart(view);
+
+			case WrappingLabel4EditPart.VISUAL_ID:
+				return new WrappingLabel4EditPart(view);
+
+			case AssignEditPart.VISUAL_ID:
+				return new AssignEditPart(view);
+
+			case AssignDataidEditPart.VISUAL_ID:
+				return new AssignDataidEditPart(view);
+
+			case AssignExprEditPart.VISUAL_ID:
+				return new AssignExprEditPart(view);
+
+			case RaiseEditPart.VISUAL_ID:
+				return new RaiseEditPart(view);
+
+			case RaiseEventEditPart.VISUAL_ID:
+				return new RaiseEventEditPart(view);
+
+			case LogEditPart.VISUAL_ID:
+				return new LogEditPart(view);
+
+			case LogExprEditPart.VISUAL_ID:
+				return new LogExprEditPart(view);
+
+			case ValidateEditPart.VISUAL_ID:
+				return new ValidateEditPart(view);
+
+			case ValidateSchemaEditPart.VISUAL_ID:
+				return new ValidateSchemaEditPart(view);
+
+			case CancelEditPart.VISUAL_ID:
+				return new CancelEditPart(view);
+
+			case CancelSendidEditPart.VISUAL_ID:
+				return new CancelSendidEditPart(view);
+
+			case SendEditPart.VISUAL_ID:
+				return new SendEditPart(view);
+
+			case SendEventEditPart.VISUAL_ID:
+				return new SendEventEditPart(view);
+
+			case ParamEditPart.VISUAL_ID:
+				return new ParamEditPart(view);
+
+			case ParamNameEditPart.VISUAL_ID:
+				return new ParamNameEditPart(view);
+
+			case ContentEditPart.VISUAL_ID:
+				return new ContentEditPart(view);
+
+			case Content2EditPart.VISUAL_ID:
+				return new Content2EditPart(view);
+
+			case Param2EditPart.VISUAL_ID:
+				return new Param2EditPart(view);
+
+			case ParamName2EditPart.VISUAL_ID:
+				return new ParamName2EditPart(view);
+
+			case Script2EditPart.VISUAL_ID:
+				return new Script2EditPart(view);
+
+			case WrappingLabel5EditPart.VISUAL_ID:
+				return new WrappingLabel5EditPart(view);
+
+			case OnExitEditPart.VISUAL_ID:
+				return new OnExitEditPart(view);
+
+			case WrappingLabel6EditPart.VISUAL_ID:
+				return new WrappingLabel6EditPart(view);
+
+			case If2EditPart.VISUAL_ID:
+				return new If2EditPart(view);
+
+			case IfCond2EditPart.VISUAL_ID:
+				return new IfCond2EditPart(view);
+
+			case Assign2EditPart.VISUAL_ID:
+				return new Assign2EditPart(view);
+
+			case AssignDataid2EditPart.VISUAL_ID:
+				return new AssignDataid2EditPart(view);
+
+			case AssignExpr2EditPart.VISUAL_ID:
+				return new AssignExpr2EditPart(view);
+
+			case Raise2EditPart.VISUAL_ID:
+				return new Raise2EditPart(view);
+
+			case RaiseEvent2EditPart.VISUAL_ID:
+				return new RaiseEvent2EditPart(view);
+
+			case Log2EditPart.VISUAL_ID:
+				return new Log2EditPart(view);
+
+			case LogExpr2EditPart.VISUAL_ID:
+				return new LogExpr2EditPart(view);
+
+			case Validate2EditPart.VISUAL_ID:
+				return new Validate2EditPart(view);
+
+			case ValidateSchema2EditPart.VISUAL_ID:
+				return new ValidateSchema2EditPart(view);
+
+			case Cancel2EditPart.VISUAL_ID:
+				return new Cancel2EditPart(view);
+
+			case CancelSendid2EditPart.VISUAL_ID:
+				return new CancelSendid2EditPart(view);
+
+			case Param3EditPart.VISUAL_ID:
+				return new Param3EditPart(view);
+
+			case ParamName3EditPart.VISUAL_ID:
+				return new ParamName3EditPart(view);
+
+			case Send2EditPart.VISUAL_ID:
+				return new Send2EditPart(view);
+
+			case SendEvent2EditPart.VISUAL_ID:
+				return new SendEvent2EditPart(view);
+
+			case Script3EditPart.VISUAL_ID:
+				return new Script3EditPart(view);
+
+			case WrappingLabel7EditPart.VISUAL_ID:
+				return new WrappingLabel7EditPart(view);
+
+			case InvokeEditPart.VISUAL_ID:
+				return new InvokeEditPart(view);
+
+			case InvokeTypeEditPart.VISUAL_ID:
+				return new InvokeTypeEditPart(view);
+
+			case FinalizeEditPart.VISUAL_ID:
+				return new FinalizeEditPart(view);
+
+			case WrappingLabel8EditPart.VISUAL_ID:
+				return new WrappingLabel8EditPart(view);
+
+			case Param4EditPart.VISUAL_ID:
+				return new Param4EditPart(view);
+
+			case ParamName4EditPart.VISUAL_ID:
+				return new ParamName4EditPart(view);
+
+			case Content3EditPart.VISUAL_ID:
+				return new Content3EditPart(view);
+
+			case InitialState2EditPart.VISUAL_ID:
+				return new InitialState2EditPart(view);
+
+			case WrappingLabel9EditPart.VISUAL_ID:
+				return new WrappingLabel9EditPart(view);
+
+			case HistoryStateEditPart.VISUAL_ID:
+				return new HistoryStateEditPart(view);
+
+			case HistoryStateIdEditPart.VISUAL_ID:
+				return new HistoryStateIdEditPart(view);
+
+			case Parallel2EditPart.VISUAL_ID:
+				return new Parallel2EditPart(view);
+
+			case ParallelId2EditPart.VISUAL_ID:
+				return new ParallelId2EditPart(view);
+
+			case HistoryState2EditPart.VISUAL_ID:
+				return new HistoryState2EditPart(view);
+
+			case HistoryStateId2EditPart.VISUAL_ID:
+				return new HistoryStateId2EditPart(view);
+
+			case AnchorEditPart.VISUAL_ID:
+				return new AnchorEditPart(view);
+
+			case AnchorTypeEditPart.VISUAL_ID:
+				return new AnchorTypeEditPart(view);
+
+			case Parallel3EditPart.VISUAL_ID:
+				return new Parallel3EditPart(view);
+
+			case ParallelId3EditPart.VISUAL_ID:
+				return new ParallelId3EditPart(view);
+
+			case OnEntry2EditPart.VISUAL_ID:
+				return new OnEntry2EditPart(view);
+
+			case WrappingLabel10EditPart.VISUAL_ID:
+				return new WrappingLabel10EditPart(view);
+
+			case OnExit2EditPart.VISUAL_ID:
+				return new OnExit2EditPart(view);
+
+			case WrappingLabel11EditPart.VISUAL_ID:
+				return new WrappingLabel11EditPart(view);
+
+			case State2EditPart.VISUAL_ID:
+				return new State2EditPart(view);
+
+			case StateId2EditPart.VISUAL_ID:
+				return new StateId2EditPart(view);
+
+			case Anchor2EditPart.VISUAL_ID:
+				return new Anchor2EditPart(view);
+
+			case AnchorType2EditPart.VISUAL_ID:
+				return new AnchorType2EditPart(view);
+
+			case FinalState2EditPart.VISUAL_ID:
+				return new FinalState2EditPart(view);
+
+			case FinalStateId2EditPart.VISUAL_ID:
+				return new FinalStateId2EditPart(view);
+
+			case DonedataEditPart.VISUAL_ID:
+				return new DonedataEditPart(view);
+
+			case WrappingLabel12EditPart.VISUAL_ID:
+				return new WrappingLabel12EditPart(view);
+
+			case Param5EditPart.VISUAL_ID:
+				return new Param5EditPart(view);
+
+			case ParamName5EditPart.VISUAL_ID:
+				return new ParamName5EditPart(view);
+
+			case Content4EditPart.VISUAL_ID:
+				return new Content4EditPart(view);
+
+			case OnEntry3EditPart.VISUAL_ID:
+				return new OnEntry3EditPart(view);
+
+			case WrappingLabel13EditPart.VISUAL_ID:
+				return new WrappingLabel13EditPart(view);
+
+			case OnExit3EditPart.VISUAL_ID:
+				return new OnExit3EditPart(view);
+
+			case WrappingLabel14EditPart.VISUAL_ID:
+				return new WrappingLabel14EditPart(view);
+
+			case State3EditPart.VISUAL_ID:
+				return new State3EditPart(view);
+
+			case StateId3EditPart.VISUAL_ID:
+				return new StateId3EditPart(view);
+
+			case DataEditPart.VISUAL_ID:
+				return new DataEditPart(view);
+
+			case DataIdEditPart.VISUAL_ID:
+				return new DataIdEditPart(view);
+
+			case Content5EditPart.VISUAL_ID:
+				return new Content5EditPart(view);
+
+			case StateStateCompartmentEditPart.VISUAL_ID:
+				return new StateStateCompartmentEditPart(view);
+
+			case OnEntryOnEntryCompartmentEditPart.VISUAL_ID:
+				return new OnEntryOnEntryCompartmentEditPart(view);
+
+			case IfIfCompartmentEditPart.VISUAL_ID:
+				return new IfIfCompartmentEditPart(view);
+
+			case SendSendCompartmentEditPart.VISUAL_ID:
+				return new SendSendCompartmentEditPart(view);
+
+			case ContentContentCompartmentEditPart.VISUAL_ID:
+				return new ContentContentCompartmentEditPart(view);
+
+			case ContentContentCompartment2EditPart.VISUAL_ID:
+				return new ContentContentCompartment2EditPart(view);
+
+			case OnExitOnExitCompartmentEditPart.VISUAL_ID:
+				return new OnExitOnExitCompartmentEditPart(view);
+
+			case IfIfCompartment2EditPart.VISUAL_ID:
+				return new IfIfCompartment2EditPart(view);
+
+			case SendSendCompartment2EditPart.VISUAL_ID:
+				return new SendSendCompartment2EditPart(view);
+
+			case InvokeInvokeCompartmentEditPart.VISUAL_ID:
+				return new InvokeInvokeCompartmentEditPart(view);
+
+			case ContentContentCompartment3EditPart.VISUAL_ID:
+				return new ContentContentCompartment3EditPart(view);
+
+			case ParallelParallelCompartmentEditPart.VISUAL_ID:
+				return new ParallelParallelCompartmentEditPart(view);
+
+			case ParallelParallelCompartment2EditPart.VISUAL_ID:
+				return new ParallelParallelCompartment2EditPart(view);
+
+			case OnEntryOnEntryCompartment2EditPart.VISUAL_ID:
+				return new OnEntryOnEntryCompartment2EditPart(view);
+
+			case OnExitOnExitCompartment2EditPart.VISUAL_ID:
+				return new OnExitOnExitCompartment2EditPart(view);
+
+			case StateStateCompartment2EditPart.VISUAL_ID:
+				return new StateStateCompartment2EditPart(view);
+
+			case FinalStateFinalStateCompartmentEditPart.VISUAL_ID:
+				return new FinalStateFinalStateCompartmentEditPart(view);
+
+			case DonedataDonedataCompartmentEditPart.VISUAL_ID:
+				return new DonedataDonedataCompartmentEditPart(view);
+
+			case ContentContentCompartment4EditPart.VISUAL_ID:
+				return new ContentContentCompartment4EditPart(view);
+
+			case OnEntryOnEntryCompartment3EditPart.VISUAL_ID:
+				return new OnEntryOnEntryCompartment3EditPart(view);
+
+			case OnExitOnExitCompartment3EditPart.VISUAL_ID:
+				return new OnExitOnExitCompartment3EditPart(view);
+
+			case StateStateCompartment3EditPart.VISUAL_ID:
+				return new StateStateCompartment3EditPart(view);
+
+			case ParallelParallelCompartment3EditPart.VISUAL_ID:
+				return new ParallelParallelCompartment3EditPart(view);
+
+			case DataModelDataModelCompartmentEditPart.VISUAL_ID:
+				return new DataModelDataModelCompartmentEditPart(view);
+
+			case DataDataCompartmentEditPart.VISUAL_ID:
+				return new DataDataCompartmentEditPart(view);
+
+			case ContentContentCompartment5EditPart.VISUAL_ID:
+				return new ContentContentCompartment5EditPart(view);
+
+			case FinalStateFinalStateCompartment2EditPart.VISUAL_ID:
+				return new FinalStateFinalStateCompartment2EditPart(view);
+
+			case TranslationEditPart.VISUAL_ID:
+				return new TranslationEditPart(view);
+
+			case TranslationEventEditPart.VISUAL_ID:
+				return new TranslationEventEditPart(view);
+			}
+		}
+		return createUnrecognizedEditPart(context, model);
+	}
+
+	/**
+	 * @generated
+	 */
+	private EditPart createUnrecognizedEditPart(EditPart context, Object model) {
+		// Handle creation of unrecognized child node EditParts here
+		return null;
+	}
+
+	/**
+	 * @generated
+	 */
+	public static CellEditorLocator getTextCellEditorLocator(
+			ITextAwareEditPart source) {
+		if (source.getFigure() instanceof WrappingLabel)
+			return new TextCellEditorLocator((WrappingLabel) source.getFigure());
+		else {
+			return new LabelCellEditorLocator((Label) source.getFigure());
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	static private class TextCellEditorLocator implements CellEditorLocator {
+
+		/**
+		 * @generated
+		 */
+		private WrappingLabel wrapLabel;
+
+		/**
+		 * @generated
+		 */
+		public TextCellEditorLocator(WrappingLabel wrapLabel) {
+			this.wrapLabel = wrapLabel;
+		}
+
+		/**
+		 * @generated
+		 */
+		public WrappingLabel getWrapLabel() {
+			return wrapLabel;
+		}
+
+		/**
+		 * @generated
+		 */
+		public void relocate(CellEditor celleditor) {
+			Text text = (Text) celleditor.getControl();
+			Rectangle rect = getWrapLabel().getTextBounds().getCopy();
+			getWrapLabel().translateToAbsolute(rect);
+			if (getWrapLabel().isTextWrapOn()
+					&& getWrapLabel().getText().length() > 0) {
+				rect.setSize(new Dimension(text.computeSize(rect.width,
+						SWT.DEFAULT)));
+			} else {
+				int avr = FigureUtilities.getFontMetrics(text.getFont())
+						.getAverageCharWidth();
+				rect.setSize(new Dimension(text.computeSize(SWT.DEFAULT,
+						SWT.DEFAULT)).expand(avr * 2, 0));
+			}
+			if (!rect.equals(new Rectangle(text.getBounds()))) {
+				text.setBounds(rect.x, rect.y, rect.width, rect.height);
+			}
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	private static class LabelCellEditorLocator implements CellEditorLocator {
+
+		/**
+		 * @generated
+		 */
+		private Label label;
+
+		/**
+		 * @generated
+		 */
+		public LabelCellEditorLocator(Label label) {
+			this.label = label;
+		}
+
+		/**
+		 * @generated
+		 */
+		public Label getLabel() {
+			return label;
+		}
+
+		/**
+		 * @generated
+		 */
+		public void relocate(CellEditor celleditor) {
+			Text text = (Text) celleditor.getControl();
+			Rectangle rect = getLabel().getTextBounds().getCopy();
+			getLabel().translateToAbsolute(rect);
+			int avr = FigureUtilities.getFontMetrics(text.getFont())
+					.getAverageCharWidth();
+			rect.setSize(new Dimension(text.computeSize(SWT.DEFAULT,
+					SWT.DEFAULT)).expand(avr * 2, 0));
+			if (!rect.equals(new Rectangle(text.getBounds()))) {
+				text.setBounds(rect.x, rect.y, rect.width, rect.height);
+			}
+		}
+	}
+}

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

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntry2EditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntry2EditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntry2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntry2EditPart.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * 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.parts;
 
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
 import org.apache.commons.scxml.modeling.diagram.edit.policies.OnEntry2ItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.RoundedRectangle;
 import org.eclipse.draw2d.StackLayout;
@@ -88,7 +72,7 @@ public class OnEntry2EditPart extends Sh
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {
 					if (child instanceof ITextAwareEditPart) {
-						return new ScxmlTextSelectionEditPolicy();
+						return new ModelingTextSelectionEditPolicy();
 					}
 				}
 				return super.createChildEditPolicy(child);
@@ -215,7 +199,7 @@ public class OnEntry2EditPart extends Sh
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(ScxmlVisualIDRegistry
+		return getChildBySemanticHint(ModelingVisualIDRegistry
 				.getType(WrappingLabel10EditPart.VISUAL_ID));
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntry3EditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntry3EditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntry3EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntry3EditPart.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * 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.parts;
 
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
 import org.apache.commons.scxml.modeling.diagram.edit.policies.OnEntry3ItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.RoundedRectangle;
 import org.eclipse.draw2d.StackLayout;
@@ -88,7 +72,7 @@ public class OnEntry3EditPart extends Sh
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {
 					if (child instanceof ITextAwareEditPart) {
-						return new ScxmlTextSelectionEditPolicy();
+						return new ModelingTextSelectionEditPolicy();
 					}
 				}
 				return super.createChildEditPolicy(child);
@@ -215,7 +199,7 @@ public class OnEntry3EditPart extends Sh
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(ScxmlVisualIDRegistry
+		return getChildBySemanticHint(ModelingVisualIDRegistry
 				.getType(WrappingLabel13EditPart.VISUAL_ID));
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryEditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryEditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryEditPart.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * 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.parts;
 
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
 import org.apache.commons.scxml.modeling.diagram.edit.policies.OnEntryItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.RoundedRectangle;
 import org.eclipse.draw2d.StackLayout;
@@ -88,7 +72,7 @@ public class OnEntryEditPart extends Sha
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {
 					if (child instanceof ITextAwareEditPart) {
-						return new ScxmlTextSelectionEditPolicy();
+						return new ModelingTextSelectionEditPolicy();
 					}
 				}
 				return super.createChildEditPolicy(child);
@@ -215,7 +199,7 @@ public class OnEntryEditPart extends Sha
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(ScxmlVisualIDRegistry
+		return getChildBySemanticHint(ModelingVisualIDRegistry
 				.getType(WrappingLabel3EditPart.VISUAL_ID));
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryOnEntryCompartment2EditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryOnEntryCompartment2EditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryOnEntryCompartment2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryOnEntryCompartment2EditPart.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.parts;
 
 import org.apache.commons.scxml.modeling.diagram.edit.policies.OnEntryOnEntryCompartment2CanonicalEditPolicy;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryOnEntryCompartment3EditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryOnEntryCompartment3EditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryOnEntryCompartment3EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryOnEntryCompartment3EditPart.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.parts;
 
 import org.apache.commons.scxml.modeling.diagram.edit.policies.OnEntryOnEntryCompartment3CanonicalEditPolicy;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryOnEntryCompartmentEditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryOnEntryCompartmentEditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryOnEntryCompartmentEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnEntryOnEntryCompartmentEditPart.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.parts;
 
 import org.apache.commons.scxml.modeling.diagram.edit.policies.OnEntryOnEntryCompartmentCanonicalEditPolicy;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExit2EditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExit2EditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExit2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExit2EditPart.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * 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.parts;
 
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
 import org.apache.commons.scxml.modeling.diagram.edit.policies.OnExit2ItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.RoundedRectangle;
 import org.eclipse.draw2d.StackLayout;
@@ -88,7 +72,7 @@ public class OnExit2EditPart extends Sha
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {
 					if (child instanceof ITextAwareEditPart) {
-						return new ScxmlTextSelectionEditPolicy();
+						return new ModelingTextSelectionEditPolicy();
 					}
 				}
 				return super.createChildEditPolicy(child);
@@ -215,7 +199,7 @@ public class OnExit2EditPart extends Sha
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(ScxmlVisualIDRegistry
+		return getChildBySemanticHint(ModelingVisualIDRegistry
 				.getType(WrappingLabel11EditPart.VISUAL_ID));
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExit3EditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExit3EditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExit3EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExit3EditPart.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * 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.parts;
 
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
 import org.apache.commons.scxml.modeling.diagram.edit.policies.OnExit3ItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.RoundedRectangle;
 import org.eclipse.draw2d.StackLayout;
@@ -88,7 +72,7 @@ public class OnExit3EditPart extends Sha
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {
 					if (child instanceof ITextAwareEditPart) {
-						return new ScxmlTextSelectionEditPolicy();
+						return new ModelingTextSelectionEditPolicy();
 					}
 				}
 				return super.createChildEditPolicy(child);
@@ -215,7 +199,7 @@ public class OnExit3EditPart extends Sha
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(ScxmlVisualIDRegistry
+		return getChildBySemanticHint(ModelingVisualIDRegistry
 				.getType(WrappingLabel14EditPart.VISUAL_ID));
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitEditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitEditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitEditPart.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * 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.parts;
 
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
 import org.apache.commons.scxml.modeling.diagram.edit.policies.OnExitItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.RoundedRectangle;
 import org.eclipse.draw2d.StackLayout;
@@ -88,7 +72,7 @@ public class OnExitEditPart extends Shap
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {
 					if (child instanceof ITextAwareEditPart) {
-						return new ScxmlTextSelectionEditPolicy();
+						return new ModelingTextSelectionEditPolicy();
 					}
 				}
 				return super.createChildEditPolicy(child);
@@ -215,7 +199,7 @@ public class OnExitEditPart extends Shap
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(ScxmlVisualIDRegistry
+		return getChildBySemanticHint(ModelingVisualIDRegistry
 				.getType(WrappingLabel6EditPart.VISUAL_ID));
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitOnExitCompartment2EditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitOnExitCompartment2EditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitOnExitCompartment2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitOnExitCompartment2EditPart.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.parts;
 
 import org.apache.commons.scxml.modeling.diagram.edit.policies.OnExitOnExitCompartment2CanonicalEditPolicy;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitOnExitCompartment3EditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitOnExitCompartment3EditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitOnExitCompartment3EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitOnExitCompartment3EditPart.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.parts;
 
 import org.apache.commons.scxml.modeling.diagram.edit.policies.OnExitOnExitCompartment3CanonicalEditPolicy;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitOnExitCompartmentEditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitOnExitCompartmentEditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitOnExitCompartmentEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/OnExitOnExitCompartmentEditPart.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.edit.parts;
 
 import org.apache.commons.scxml.modeling.diagram.edit.policies.OnExitOnExitCompartmentCanonicalEditPolicy;

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Parallel2EditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Parallel2EditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Parallel2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Parallel2EditPart.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * 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.parts;
 
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
 import org.apache.commons.scxml.modeling.diagram.edit.policies.Parallel2ItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.RoundedRectangle;
 import org.eclipse.draw2d.StackLayout;
@@ -87,7 +71,7 @@ public class Parallel2EditPart extends S
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {
 					if (child instanceof ITextAwareEditPart) {
-						return new ScxmlTextSelectionEditPolicy();
+						return new ModelingTextSelectionEditPolicy();
 					}
 				}
 				return super.createChildEditPolicy(child);
@@ -214,7 +198,7 @@ public class Parallel2EditPart extends S
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(ScxmlVisualIDRegistry
+		return getChildBySemanticHint(ModelingVisualIDRegistry
 				.getType(ParallelId2EditPart.VISUAL_ID));
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Parallel3EditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Parallel3EditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Parallel3EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Parallel3EditPart.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * 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.parts;
 
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
 import org.apache.commons.scxml.modeling.diagram.edit.policies.Parallel3ItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.RoundedRectangle;
 import org.eclipse.draw2d.StackLayout;
@@ -87,7 +71,7 @@ public class Parallel3EditPart extends S
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {
 					if (child instanceof ITextAwareEditPart) {
-						return new ScxmlTextSelectionEditPolicy();
+						return new ModelingTextSelectionEditPolicy();
 					}
 				}
 				return super.createChildEditPolicy(child);
@@ -214,7 +198,7 @@ public class Parallel3EditPart extends S
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(ScxmlVisualIDRegistry
+		return getChildBySemanticHint(ModelingVisualIDRegistry
 				.getType(ParallelId3EditPart.VISUAL_ID));
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ParallelEditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ParallelEditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ParallelEditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ParallelEditPart.java Tue May 18 15:13:13 2010
@@ -1,24 +1,8 @@
-/*
- * 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.parts;
 
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
 import org.apache.commons.scxml.modeling.diagram.edit.policies.ParallelItemSemanticEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.part.ScxmlVisualIDRegistry;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.RoundedRectangle;
 import org.eclipse.draw2d.StackLayout;
@@ -87,7 +71,7 @@ public class ParallelEditPart extends Sh
 			protected EditPolicy createChildEditPolicy(EditPart child) {
 				if (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {
 					if (child instanceof ITextAwareEditPart) {
-						return new ScxmlTextSelectionEditPolicy();
+						return new ModelingTextSelectionEditPolicy();
 					}
 				}
 				return super.createChildEditPolicy(child);
@@ -214,7 +198,7 @@ public class ParallelEditPart extends Sh
 	 * @generated
 	 */
 	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(ScxmlVisualIDRegistry
+		return getChildBySemanticHint(ModelingVisualIDRegistry
 				.getType(ParallelIdEditPart.VISUAL_ID));
 	}
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ParallelId2EditPart.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ParallelId2EditPart.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ParallelId2EditPart.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ParallelId2EditPart.java Tue May 18 15:13:13 2010
@@ -1,28 +1,12 @@
-/*
- * 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.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.scxml.modeling.diagram.edit.policies.ScxmlTextSelectionEditPolicy;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlElementTypes;
-import org.apache.commons.scxml.modeling.diagram.providers.ScxmlParserProvider;
+import org.apache.commons.scxml.modeling.diagram.edit.policies.ModelingTextSelectionEditPolicy;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingElementTypes;
+import org.apache.commons.scxml.modeling.diagram.providers.ModelingParserProvider;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;
@@ -214,7 +198,7 @@ public class ParallelId2EditPart extends
 		if (parserElement == null) {
 			return null;
 		}
-		return ScxmlElementTypes.getImage(parserElement.eClass());
+		return ModelingElementTypes.getImage(parserElement.eClass());
 	}
 
 	/**
@@ -240,8 +224,8 @@ public class ParallelId2EditPart extends
 	public void setLabelText(String text) {
 		setLabelTextHelper(getFigure(), text);
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 
@@ -321,8 +305,8 @@ public class ParallelId2EditPart extends
 	public IParser getParser() {
 		if (parser == null) {
 			String parserHint = ((View) getModel()).getType();
-			IAdaptable hintAdapter = new ScxmlParserProvider.HintAdapter(
-					ScxmlElementTypes.Parallel_2032, getParserElement(),
+			IAdaptable hintAdapter = new ModelingParserProvider.HintAdapter(
+					ModelingElementTypes.Parallel_2032, getParserElement(),
 					parserHint);
 			parser = ParserService.getInstance().getParser(hintAdapter);
 		}
@@ -335,7 +319,7 @@ public class ParallelId2EditPart extends
 	protected DirectEditManager getManager() {
 		if (manager == null) {
 			setManager(new TextDirectEditManager(this, TextDirectEditManager
-					.getTextCellEditorClass(this), ScxmlEditPartFactory
+					.getTextCellEditorClass(this), ModelingEditPartFactory
 					.getTextCellEditorLocator(this)));
 		}
 		return manager;
@@ -429,8 +413,8 @@ public class ParallelId2EditPart extends
 		setLabelTextHelper(getFigure(), getLabelText());
 		setLabelIconHelper(getFigure(), getLabelIcon());
 		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof ScxmlTextSelectionEditPolicy) {
-			((ScxmlTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
+		if (pdEditPolicy instanceof ModelingTextSelectionEditPolicy) {
+			((ModelingTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
 		}
 	}
 



Mime
View raw message