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

svn commit: r947358 - 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/parts/ src/org/apache/commons/scxml/modeling/diagram/part/ src/org/ap...

Author: guixl
Date: Sun May 23 05:06:45 2010
New Revision: 947358

URL: http://svn.apache.org/viewvc?rev=947358&view=rev
Log:
edit view figure for some SCXML elements

Modified:
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.properties
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Anchor2EditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/AnchorEditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Assign2EditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/AssignEditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Cancel2EditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/CancelEditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/HistoryState2EditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/HistoryStateEditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ModelingEditPartFactory.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Param2EditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Param3EditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Param4EditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Param5EditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ParamEditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Send2EditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/SendEditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/TransitionCondEditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/Validate2EditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/edit/parts/ValidateEditPart.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ModelingVisualIDRegistry.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingParserProvider.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingViewProvider.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Assign2ViewFactory.java
    commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignViewFactory.java

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties?rev=947358&r1=947357&r2=947358&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/messages.properties Sun May 23 05:06:45 2010
@@ -245,4 +245,4 @@ NavigatorGroupName_FinalState_3040_outgo
 NavigatorGroupName_State_3046_incominglinks=incoming links
 NavigatorGroupName_State_3046_outgoinglinks=outgoing links
 NavigatorGroupName_Transition_4001_target=target
-NavigatorGroupName_Transition_4001_source=source
\ No newline at end of file
+NavigatorGroupName_Transition_4001_source=source

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.properties
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.properties?rev=947358&r1=947357&r2=947358&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.properties (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/plugin.properties Sun May 23 05:06:45 2010
@@ -151,4 +151,4 @@ metatype.name.OnExit_3045=OnExit
 metatype.name.State_3046=State
 metatype.name.Data_3047=Data
 metatype.name.Content_3048=Content
-metatype.name.Transition_4001=Transition
\ No newline at end of file
+metatype.name.Transition_4001=Transition

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/parts/Anchor2EditPart.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/parts/Anchor2EditPart.java?rev=947358&r1=947357&r2=947358&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/parts/Anchor2EditPart.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/parts/Anchor2EditPart.java Sun May 23 05:06:45 2010
@@ -230,10 +230,6 @@ public class Anchor2EditPart extends Sha
 		 * @generated
 		 */
 		private WrappingLabel fFigureAnchorTypeFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureAnchorSnapshotFigure;
 
 		/**
 		 * @generated
@@ -264,11 +260,6 @@ public class Anchor2EditPart extends Sha
 
 			this.add(fFigureAnchorTypeFigure);
 
-			fFigureAnchorSnapshotFigure = new WrappingLabel();
-			fFigureAnchorSnapshotFigure.setText("<...>");
-
-			this.add(fFigureAnchorSnapshotFigure);
-
 		}
 
 		/**
@@ -297,13 +288,6 @@ public class Anchor2EditPart extends Sha
 			return fFigureAnchorTypeFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureAnchorSnapshotFigure() {
-			return fFigureAnchorSnapshotFigure;
-		}
-
 	}
 
 }

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/parts/AnchorEditPart.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/parts/AnchorEditPart.java?rev=947358&r1=947357&r2=947358&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/parts/AnchorEditPart.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/parts/AnchorEditPart.java Sun May 23 05:06:45 2010
@@ -230,10 +230,6 @@ public class AnchorEditPart extends Shap
 		 * @generated
 		 */
 		private WrappingLabel fFigureAnchorTypeFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureAnchorSnapshotFigure;
 
 		/**
 		 * @generated
@@ -264,11 +260,6 @@ public class AnchorEditPart extends Shap
 
 			this.add(fFigureAnchorTypeFigure);
 
-			fFigureAnchorSnapshotFigure = new WrappingLabel();
-			fFigureAnchorSnapshotFigure.setText("<...>");
-
-			this.add(fFigureAnchorSnapshotFigure);
-
 		}
 
 		/**
@@ -297,13 +288,6 @@ public class AnchorEditPart extends Shap
 			return fFigureAnchorTypeFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureAnchorSnapshotFigure() {
-			return fFigureAnchorSnapshotFigure;
-		}
-
 	}
 
 }

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/parts/Assign2EditPart.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/parts/Assign2EditPart.java?rev=947358&r1=947357&r2=947358&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/parts/Assign2EditPart.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/parts/Assign2EditPart.java Sun May 23 05:06:45 2010
@@ -123,11 +123,6 @@ public class Assign2EditPart extends Sha
 					.getFigureAssignDataidFigure());
 			return true;
 		}
-		if (childEditPart instanceof AssignExpr2EditPart) {
-			((AssignExpr2EditPart) childEditPart).setLabel(getPrimaryShape()
-					.getFigureAssignExprFigure());
-			return true;
-		}
 		return false;
 	}
 
@@ -235,10 +230,6 @@ public class Assign2EditPart extends Sha
 		 * @generated
 		 */
 		private WrappingLabel fFigureAssignDataidFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureAssignExprFigure;
 
 		/**
 		 * @generated
@@ -269,11 +260,6 @@ public class Assign2EditPart extends Sha
 
 			this.add(fFigureAssignDataidFigure);
 
-			fFigureAssignExprFigure = new WrappingLabel();
-			fFigureAssignExprFigure.setText("<...>");
-
-			this.add(fFigureAssignExprFigure);
-
 		}
 
 		/**
@@ -302,13 +288,6 @@ public class Assign2EditPart extends Sha
 			return fFigureAssignDataidFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureAssignExprFigure() {
-			return fFigureAssignExprFigure;
-		}
-
 	}
 
 }

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/parts/AssignEditPart.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/parts/AssignEditPart.java?rev=947358&r1=947357&r2=947358&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/parts/AssignEditPart.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/parts/AssignEditPart.java Sun May 23 05:06:45 2010
@@ -123,11 +123,6 @@ public class AssignEditPart extends Shap
 					.getFigureAssignDataidFigure());
 			return true;
 		}
-		if (childEditPart instanceof AssignExprEditPart) {
-			((AssignExprEditPart) childEditPart).setLabel(getPrimaryShape()
-					.getFigureAssignExprFigure());
-			return true;
-		}
 		return false;
 	}
 
@@ -235,10 +230,6 @@ public class AssignEditPart extends Shap
 		 * @generated
 		 */
 		private WrappingLabel fFigureAssignDataidFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureAssignExprFigure;
 
 		/**
 		 * @generated
@@ -269,11 +260,6 @@ public class AssignEditPart extends Shap
 
 			this.add(fFigureAssignDataidFigure);
 
-			fFigureAssignExprFigure = new WrappingLabel();
-			fFigureAssignExprFigure.setText("<...>");
-
-			this.add(fFigureAssignExprFigure);
-
 		}
 
 		/**
@@ -302,13 +288,6 @@ public class AssignEditPart extends Shap
 			return fFigureAssignDataidFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureAssignExprFigure() {
-			return fFigureAssignExprFigure;
-		}
-
 	}
 
 }

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/parts/Cancel2EditPart.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/parts/Cancel2EditPart.java?rev=947358&r1=947357&r2=947358&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/parts/Cancel2EditPart.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/parts/Cancel2EditPart.java Sun May 23 05:06:45 2010
@@ -230,10 +230,6 @@ public class Cancel2EditPart extends Sha
 		 * @generated
 		 */
 		private WrappingLabel fFigureCancelSendidFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureCancelSendidexprFigure;
 
 		/**
 		 * @generated
@@ -264,11 +260,6 @@ public class Cancel2EditPart extends Sha
 
 			this.add(fFigureCancelSendidFigure);
 
-			fFigureCancelSendidexprFigure = new WrappingLabel();
-			fFigureCancelSendidexprFigure.setText("<...>");
-
-			this.add(fFigureCancelSendidexprFigure);
-
 		}
 
 		/**
@@ -297,13 +288,6 @@ public class Cancel2EditPart extends Sha
 			return fFigureCancelSendidFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureCancelSendidexprFigure() {
-			return fFigureCancelSendidexprFigure;
-		}
-
 	}
 
 }

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/parts/CancelEditPart.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/parts/CancelEditPart.java?rev=947358&r1=947357&r2=947358&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/parts/CancelEditPart.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/parts/CancelEditPart.java Sun May 23 05:06:45 2010
@@ -230,10 +230,6 @@ public class CancelEditPart extends Shap
 		 * @generated
 		 */
 		private WrappingLabel fFigureCancelSendidFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureCancelSendidexprFigure;
 
 		/**
 		 * @generated
@@ -264,11 +260,6 @@ public class CancelEditPart extends Shap
 
 			this.add(fFigureCancelSendidFigure);
 
-			fFigureCancelSendidexprFigure = new WrappingLabel();
-			fFigureCancelSendidexprFigure.setText("<...>");
-
-			this.add(fFigureCancelSendidexprFigure);
-
 		}
 
 		/**
@@ -297,13 +288,6 @@ public class CancelEditPart extends Shap
 			return fFigureCancelSendidFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureCancelSendidexprFigure() {
-			return fFigureCancelSendidexprFigure;
-		}
-
 	}
 
 }

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/parts/HistoryState2EditPart.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/parts/HistoryState2EditPart.java?rev=947358&r1=947357&r2=947358&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/parts/HistoryState2EditPart.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/parts/HistoryState2EditPart.java Sun May 23 05:06:45 2010
@@ -230,10 +230,6 @@ public class HistoryState2EditPart exten
 		 * @generated
 		 */
 		private WrappingLabel fFigureHistoryStateIdFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureHistoryStateTypeFigure;
 
 		/**
 		 * @generated
@@ -264,11 +260,6 @@ public class HistoryState2EditPart exten
 
 			this.add(fFigureHistoryStateIdFigure);
 
-			fFigureHistoryStateTypeFigure = new WrappingLabel();
-			fFigureHistoryStateTypeFigure.setText("<...>");
-
-			this.add(fFigureHistoryStateTypeFigure);
-
 		}
 
 		/**
@@ -297,13 +288,6 @@ public class HistoryState2EditPart exten
 			return fFigureHistoryStateIdFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureHistoryStateTypeFigure() {
-			return fFigureHistoryStateTypeFigure;
-		}
-
 	}
 
 }

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/parts/HistoryStateEditPart.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/parts/HistoryStateEditPart.java?rev=947358&r1=947357&r2=947358&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/parts/HistoryStateEditPart.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/parts/HistoryStateEditPart.java Sun May 23 05:06:45 2010
@@ -230,10 +230,6 @@ public class HistoryStateEditPart extend
 		 * @generated
 		 */
 		private WrappingLabel fFigureHistoryStateIdFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureHistoryStateTypeFigure;
 
 		/**
 		 * @generated
@@ -264,11 +260,6 @@ public class HistoryStateEditPart extend
 
 			this.add(fFigureHistoryStateIdFigure);
 
-			fFigureHistoryStateTypeFigure = new WrappingLabel();
-			fFigureHistoryStateTypeFigure.setText("<...>");
-
-			this.add(fFigureHistoryStateTypeFigure);
-
 		}
 
 		/**
@@ -297,13 +288,6 @@ public class HistoryStateEditPart extend
 			return fFigureHistoryStateIdFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureHistoryStateTypeFigure() {
-			return fFigureHistoryStateTypeFigure;
-		}
-
 	}
 
 }

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/parts/ModelingEditPartFactory.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/parts/ModelingEditPartFactory.java?rev=947358&r1=947357&r2=947358&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/parts/ModelingEditPartFactory.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/parts/ModelingEditPartFactory.java Sun May 23 05:06:45 2010
@@ -113,9 +113,6 @@ public class ModelingEditPartFactory imp
 			case AssignDataidEditPart.VISUAL_ID:
 				return new AssignDataidEditPart(view);
 
-			case AssignExprEditPart.VISUAL_ID:
-				return new AssignExprEditPart(view);
-
 			case RaiseEditPart.VISUAL_ID:
 				return new RaiseEditPart(view);
 
@@ -188,9 +185,6 @@ public class ModelingEditPartFactory imp
 			case AssignDataid2EditPart.VISUAL_ID:
 				return new AssignDataid2EditPart(view);
 
-			case AssignExpr2EditPart.VISUAL_ID:
-				return new AssignExpr2EditPart(view);
-
 			case Raise2EditPart.VISUAL_ID:
 				return new Raise2EditPart(view);
 

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/parts/Param2EditPart.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/parts/Param2EditPart.java?rev=947358&r1=947357&r2=947358&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/parts/Param2EditPart.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/parts/Param2EditPart.java Sun May 23 05:06:45 2010
@@ -230,10 +230,6 @@ public class Param2EditPart extends Shap
 		 * @generated
 		 */
 		private WrappingLabel fFigureParamNameFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureParamExprFigure;
 
 		/**
 		 * @generated
@@ -264,11 +260,6 @@ public class Param2EditPart extends Shap
 
 			this.add(fFigureParamNameFigure);
 
-			fFigureParamExprFigure = new WrappingLabel();
-			fFigureParamExprFigure.setText("<...>");
-
-			this.add(fFigureParamExprFigure);
-
 		}
 
 		/**
@@ -297,13 +288,6 @@ public class Param2EditPart extends Shap
 			return fFigureParamNameFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureParamExprFigure() {
-			return fFigureParamExprFigure;
-		}
-
 	}
 
 }

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/parts/Param3EditPart.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/parts/Param3EditPart.java?rev=947358&r1=947357&r2=947358&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/parts/Param3EditPart.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/parts/Param3EditPart.java Sun May 23 05:06:45 2010
@@ -230,10 +230,6 @@ public class Param3EditPart extends Shap
 		 * @generated
 		 */
 		private WrappingLabel fFigureParamNameFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureParamExprFigure;
 
 		/**
 		 * @generated
@@ -264,11 +260,6 @@ public class Param3EditPart extends Shap
 
 			this.add(fFigureParamNameFigure);
 
-			fFigureParamExprFigure = new WrappingLabel();
-			fFigureParamExprFigure.setText("<...>");
-
-			this.add(fFigureParamExprFigure);
-
 		}
 
 		/**
@@ -297,13 +288,6 @@ public class Param3EditPart extends Shap
 			return fFigureParamNameFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureParamExprFigure() {
-			return fFigureParamExprFigure;
-		}
-
 	}
 
 }

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/parts/Param4EditPart.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/parts/Param4EditPart.java?rev=947358&r1=947357&r2=947358&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/parts/Param4EditPart.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/parts/Param4EditPart.java Sun May 23 05:06:45 2010
@@ -230,10 +230,6 @@ public class Param4EditPart extends Shap
 		 * @generated
 		 */
 		private WrappingLabel fFigureParamNameFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureParamExprFigure;
 
 		/**
 		 * @generated
@@ -264,11 +260,6 @@ public class Param4EditPart extends Shap
 
 			this.add(fFigureParamNameFigure);
 
-			fFigureParamExprFigure = new WrappingLabel();
-			fFigureParamExprFigure.setText("<...>");
-
-			this.add(fFigureParamExprFigure);
-
 		}
 
 		/**
@@ -297,13 +288,6 @@ public class Param4EditPart extends Shap
 			return fFigureParamNameFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureParamExprFigure() {
-			return fFigureParamExprFigure;
-		}
-
 	}
 
 }

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/parts/Param5EditPart.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/parts/Param5EditPart.java?rev=947358&r1=947357&r2=947358&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/parts/Param5EditPart.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/parts/Param5EditPart.java Sun May 23 05:06:45 2010
@@ -230,10 +230,6 @@ public class Param5EditPart extends Shap
 		 * @generated
 		 */
 		private WrappingLabel fFigureParamNameFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureParamExprFigure;
 
 		/**
 		 * @generated
@@ -264,11 +260,6 @@ public class Param5EditPart extends Shap
 
 			this.add(fFigureParamNameFigure);
 
-			fFigureParamExprFigure = new WrappingLabel();
-			fFigureParamExprFigure.setText("<...>");
-
-			this.add(fFigureParamExprFigure);
-
 		}
 
 		/**
@@ -297,13 +288,6 @@ public class Param5EditPart extends Shap
 			return fFigureParamNameFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureParamExprFigure() {
-			return fFigureParamExprFigure;
-		}
-
 	}
 
 }

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/parts/ParamEditPart.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/parts/ParamEditPart.java?rev=947358&r1=947357&r2=947358&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/parts/ParamEditPart.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/parts/ParamEditPart.java Sun May 23 05:06:45 2010
@@ -230,10 +230,6 @@ public class ParamEditPart extends Shape
 		 * @generated
 		 */
 		private WrappingLabel fFigureParamNameFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureParamExprFigure;
 
 		/**
 		 * @generated
@@ -264,11 +260,6 @@ public class ParamEditPart extends Shape
 
 			this.add(fFigureParamNameFigure);
 
-			fFigureParamExprFigure = new WrappingLabel();
-			fFigureParamExprFigure.setText("<...>");
-
-			this.add(fFigureParamExprFigure);
-
 		}
 
 		/**
@@ -297,13 +288,6 @@ public class ParamEditPart extends Shape
 			return fFigureParamNameFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureParamExprFigure() {
-			return fFigureParamExprFigure;
-		}
-
 	}
 
 }

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/parts/Send2EditPart.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/parts/Send2EditPart.java?rev=947358&r1=947357&r2=947358&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/parts/Send2EditPart.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/parts/Send2EditPart.java Sun May 23 05:06:45 2010
@@ -230,54 +230,6 @@ public class Send2EditPart extends Shape
 		 * @generated
 		 */
 		private WrappingLabel fFigureSendEventFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendEventexprFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendTargetFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendTargetexprFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendTypeFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendTypeexprFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendIdFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendIdlocationFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendDelayFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendDelayexprFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendNamelistFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendHintsFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendHintsexprFigure;
 
 		/**
 		 * @generated
@@ -308,66 +260,6 @@ public class Send2EditPart extends Shape
 
 			this.add(fFigureSendEventFigure);
 
-			fFigureSendEventexprFigure = new WrappingLabel();
-			fFigureSendEventexprFigure.setText("<...>");
-
-			this.add(fFigureSendEventexprFigure);
-
-			fFigureSendTargetFigure = new WrappingLabel();
-			fFigureSendTargetFigure.setText("<...>");
-
-			this.add(fFigureSendTargetFigure);
-
-			fFigureSendTargetexprFigure = new WrappingLabel();
-			fFigureSendTargetexprFigure.setText("<...>");
-
-			this.add(fFigureSendTargetexprFigure);
-
-			fFigureSendTypeFigure = new WrappingLabel();
-			fFigureSendTypeFigure.setText("<...>");
-
-			this.add(fFigureSendTypeFigure);
-
-			fFigureSendTypeexprFigure = new WrappingLabel();
-			fFigureSendTypeexprFigure.setText("<...>");
-
-			this.add(fFigureSendTypeexprFigure);
-
-			fFigureSendIdFigure = new WrappingLabel();
-			fFigureSendIdFigure.setText("<...>");
-
-			this.add(fFigureSendIdFigure);
-
-			fFigureSendIdlocationFigure = new WrappingLabel();
-			fFigureSendIdlocationFigure.setText("<...>");
-
-			this.add(fFigureSendIdlocationFigure);
-
-			fFigureSendDelayFigure = new WrappingLabel();
-			fFigureSendDelayFigure.setText("<...>");
-
-			this.add(fFigureSendDelayFigure);
-
-			fFigureSendDelayexprFigure = new WrappingLabel();
-			fFigureSendDelayexprFigure.setText("<...>");
-
-			this.add(fFigureSendDelayexprFigure);
-
-			fFigureSendNamelistFigure = new WrappingLabel();
-			fFigureSendNamelistFigure.setText("<...>");
-
-			this.add(fFigureSendNamelistFigure);
-
-			fFigureSendHintsFigure = new WrappingLabel();
-			fFigureSendHintsFigure.setText("<...>");
-
-			this.add(fFigureSendHintsFigure);
-
-			fFigureSendHintsexprFigure = new WrappingLabel();
-			fFigureSendHintsexprFigure.setText("<...>");
-
-			this.add(fFigureSendHintsexprFigure);
-
 		}
 
 		/**
@@ -396,90 +288,6 @@ public class Send2EditPart extends Shape
 			return fFigureSendEventFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendEventexprFigure() {
-			return fFigureSendEventexprFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendTargetFigure() {
-			return fFigureSendTargetFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendTargetexprFigure() {
-			return fFigureSendTargetexprFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendTypeFigure() {
-			return fFigureSendTypeFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendTypeexprFigure() {
-			return fFigureSendTypeexprFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendIdFigure() {
-			return fFigureSendIdFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendIdlocationFigure() {
-			return fFigureSendIdlocationFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendDelayFigure() {
-			return fFigureSendDelayFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendDelayexprFigure() {
-			return fFigureSendDelayexprFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendNamelistFigure() {
-			return fFigureSendNamelistFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendHintsFigure() {
-			return fFigureSendHintsFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendHintsexprFigure() {
-			return fFigureSendHintsexprFigure;
-		}
-
 	}
 
 }

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/parts/SendEditPart.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/parts/SendEditPart.java?rev=947358&r1=947357&r2=947358&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/parts/SendEditPart.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/parts/SendEditPart.java Sun May 23 05:06:45 2010
@@ -230,54 +230,6 @@ public class SendEditPart extends ShapeN
 		 * @generated
 		 */
 		private WrappingLabel fFigureSendEventFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendEventexprFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendTargetFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendTargetexprFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendTypeFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendTypeexprFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendIdFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendIdlocationFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendDelayFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendDelayexprFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendNamelistFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendHintsFigure;
-		/**
-		 * @generated
-		 */
-		private WrappingLabel fFigureSendHintsexprFigure;
 
 		/**
 		 * @generated
@@ -308,66 +260,6 @@ public class SendEditPart extends ShapeN
 
 			this.add(fFigureSendEventFigure);
 
-			fFigureSendEventexprFigure = new WrappingLabel();
-			fFigureSendEventexprFigure.setText("<...>");
-
-			this.add(fFigureSendEventexprFigure);
-
-			fFigureSendTargetFigure = new WrappingLabel();
-			fFigureSendTargetFigure.setText("<...>");
-
-			this.add(fFigureSendTargetFigure);
-
-			fFigureSendTargetexprFigure = new WrappingLabel();
-			fFigureSendTargetexprFigure.setText("<...>");
-
-			this.add(fFigureSendTargetexprFigure);
-
-			fFigureSendTypeFigure = new WrappingLabel();
-			fFigureSendTypeFigure.setText("<...>");
-
-			this.add(fFigureSendTypeFigure);
-
-			fFigureSendTypeexprFigure = new WrappingLabel();
-			fFigureSendTypeexprFigure.setText("<...>");
-
-			this.add(fFigureSendTypeexprFigure);
-
-			fFigureSendIdFigure = new WrappingLabel();
-			fFigureSendIdFigure.setText("<...>");
-
-			this.add(fFigureSendIdFigure);
-
-			fFigureSendIdlocationFigure = new WrappingLabel();
-			fFigureSendIdlocationFigure.setText("<...>");
-
-			this.add(fFigureSendIdlocationFigure);
-
-			fFigureSendDelayFigure = new WrappingLabel();
-			fFigureSendDelayFigure.setText("<...>");
-
-			this.add(fFigureSendDelayFigure);
-
-			fFigureSendDelayexprFigure = new WrappingLabel();
-			fFigureSendDelayexprFigure.setText("<...>");
-
-			this.add(fFigureSendDelayexprFigure);
-
-			fFigureSendNamelistFigure = new WrappingLabel();
-			fFigureSendNamelistFigure.setText("<...>");
-
-			this.add(fFigureSendNamelistFigure);
-
-			fFigureSendHintsFigure = new WrappingLabel();
-			fFigureSendHintsFigure.setText("<...>");
-
-			this.add(fFigureSendHintsFigure);
-
-			fFigureSendHintsexprFigure = new WrappingLabel();
-			fFigureSendHintsexprFigure.setText("<...>");
-
-			this.add(fFigureSendHintsexprFigure);
-
 		}
 
 		/**
@@ -396,90 +288,6 @@ public class SendEditPart extends ShapeN
 			return fFigureSendEventFigure;
 		}
 
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendEventexprFigure() {
-			return fFigureSendEventexprFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendTargetFigure() {
-			return fFigureSendTargetFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendTargetexprFigure() {
-			return fFigureSendTargetexprFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendTypeFigure() {
-			return fFigureSendTypeFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendTypeexprFigure() {
-			return fFigureSendTypeexprFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendIdFigure() {
-			return fFigureSendIdFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendIdlocationFigure() {
-			return fFigureSendIdlocationFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendDelayFigure() {
-			return fFigureSendDelayFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendDelayexprFigure() {
-			return fFigureSendDelayexprFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendNamelistFigure() {
-			return fFigureSendNamelistFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendHintsFigure() {
-			return fFigureSendHintsFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public WrappingLabel getFigureSendHintsexprFigure() {
-			return fFigureSendHintsexprFigure;
-		}
-
 	}
 
 }

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/parts/TransitionCondEditPart.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/parts/TransitionCondEditPart.java?rev=947358&r1=947357&r2=947358&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/parts/TransitionCondEditPart.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/parts/TransitionCondEditPart.java Sun May 23 05:06:45 2010
@@ -206,11 +206,7 @@ public class TransitionCondEditPart exte
 	 * @generated
 	 */
 	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		return ModelingElementTypes.getImage(parserElement.eClass());
+		return null;
 	}
 
 	/**

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/parts/Validate2EditPart.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/parts/Validate2EditPart.java?rev=947358&r1=947357&r2=947358&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/parts/Validate2EditPart.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/parts/Validate2EditPart.java Sun May 23 05:06:45 2010
@@ -229,10 +229,6 @@ public class Validate2EditPart extends S
 		/**
 		 * @generated
 		 */
-		private WrappingLabel fFigureValidateLocationFigure;
-		/**
-		 * @generated
-		 */
 		private WrappingLabel fFigureValidateSchemaFigure;
 
 		/**
@@ -259,11 +255,6 @@ public class Validate2EditPart extends S
 		 */
 		private void createContents() {
 
-			fFigureValidateLocationFigure = new WrappingLabel();
-			fFigureValidateLocationFigure.setText("<...>");
-
-			this.add(fFigureValidateLocationFigure);
-
 			fFigureValidateSchemaFigure = new WrappingLabel();
 			fFigureValidateSchemaFigure.setText("<...>");
 
@@ -293,13 +284,6 @@ public class Validate2EditPart extends S
 		/**
 		 * @generated
 		 */
-		public WrappingLabel getFigureValidateLocationFigure() {
-			return fFigureValidateLocationFigure;
-		}
-
-		/**
-		 * @generated
-		 */
 		public WrappingLabel getFigureValidateSchemaFigure() {
 			return fFigureValidateSchemaFigure;
 		}

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/parts/ValidateEditPart.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/parts/ValidateEditPart.java?rev=947358&r1=947357&r2=947358&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/parts/ValidateEditPart.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/parts/ValidateEditPart.java Sun May 23 05:06:45 2010
@@ -229,10 +229,6 @@ public class ValidateEditPart extends Sh
 		/**
 		 * @generated
 		 */
-		private WrappingLabel fFigureValidateLocationFigure;
-		/**
-		 * @generated
-		 */
 		private WrappingLabel fFigureValidateSchemaFigure;
 
 		/**
@@ -259,11 +255,6 @@ public class ValidateEditPart extends Sh
 		 */
 		private void createContents() {
 
-			fFigureValidateLocationFigure = new WrappingLabel();
-			fFigureValidateLocationFigure.setText("<...>");
-
-			this.add(fFigureValidateLocationFigure);
-
 			fFigureValidateSchemaFigure = new WrappingLabel();
 			fFigureValidateSchemaFigure.setText("<...>");
 
@@ -293,13 +284,6 @@ public class ValidateEditPart extends Sh
 		/**
 		 * @generated
 		 */
-		public WrappingLabel getFigureValidateLocationFigure() {
-			return fFigureValidateLocationFigure;
-		}
-
-		/**
-		 * @generated
-		 */
 		public WrappingLabel getFigureValidateSchemaFigure() {
 			return fFigureValidateSchemaFigure;
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/part/ModelingVisualIDRegistry.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/part/ModelingVisualIDRegistry.java?rev=947358&r1=947357&r2=947358&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/part/ModelingVisualIDRegistry.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/part/ModelingVisualIDRegistry.java Sun May 23 05:06:45 2010
@@ -809,9 +809,6 @@ public class ModelingVisualIDRegistry {
 			if (AssignDataidEditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
-			if (AssignExprEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
 			break;
 		case RaiseEditPart.VISUAL_ID:
 			if (RaiseEventEditPart.VISUAL_ID == nodeVisualID) {
@@ -886,9 +883,6 @@ public class ModelingVisualIDRegistry {
 			if (AssignDataid2EditPart.VISUAL_ID == nodeVisualID) {
 				return true;
 			}
-			if (AssignExpr2EditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
 			break;
 		case Raise2EditPart.VISUAL_ID:
 			if (RaiseEvent2EditPart.VISUAL_ID == nodeVisualID) {

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingParserProvider.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/providers/ModelingParserProvider.java?rev=947358&r1=947357&r2=947358&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/providers/ModelingParserProvider.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/providers/ModelingParserProvider.java Sun May 23 05:06:45 2010
@@ -253,31 +253,6 @@ public class ModelingParserProvider exte
 	/**
 	 * @generated
 	 */
-	private IParser assignExpr_5005Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getAssignExpr_5005Parser() {
-		if (assignExpr_5005Parser == null) {
-			assignExpr_5005Parser = createAssignExpr_5005Parser();
-		}
-		return assignExpr_5005Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createAssignExpr_5005Parser() {
-		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
-				.getAssign_Expr(), };
-		MessageFormatParser parser = new MessageFormatParser(features);
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
 	private IParser raiseEvent_5006Parser;
 
 	/**
@@ -503,31 +478,6 @@ public class ModelingParserProvider exte
 	/**
 	 * @generated
 	 */
-	private IParser assignExpr_5017Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getAssignExpr_5017Parser() {
-		if (assignExpr_5017Parser == null) {
-			assignExpr_5017Parser = createAssignExpr_5017Parser();
-		}
-		return assignExpr_5017Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser createAssignExpr_5017Parser() {
-		EAttribute[] features = new EAttribute[] { ModelingPackage.eINSTANCE
-				.getAssign_Expr(), };
-		MessageFormatParser parser = new MessageFormatParser(features);
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
 	private IParser raiseEvent_5018Parser;
 
 	/**
@@ -1044,8 +994,6 @@ public class ModelingParserProvider exte
 			return getElseIfCond_5001Parser();
 		case AssignDataidEditPart.VISUAL_ID:
 			return getAssignDataid_5004Parser();
-		case AssignExprEditPart.VISUAL_ID:
-			return getAssignExpr_5005Parser();
 		case RaiseEventEditPart.VISUAL_ID:
 			return getRaiseEvent_5006Parser();
 		case LogExprEditPart.VISUAL_ID:
@@ -1064,8 +1012,6 @@ public class ModelingParserProvider exte
 			return getIfCond_5015Parser();
 		case AssignDataid2EditPart.VISUAL_ID:
 			return getAssignDataid_5016Parser();
-		case AssignExpr2EditPart.VISUAL_ID:
-			return getAssignExpr_5017Parser();
 		case RaiseEvent2EditPart.VISUAL_ID:
 			return getRaiseEvent_5018Parser();
 		case LogExpr2EditPart.VISUAL_ID:

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/providers/ModelingViewProvider.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/providers/ModelingViewProvider.java?rev=947358&r1=947357&r2=947358&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/providers/ModelingViewProvider.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/providers/ModelingViewProvider.java Sun May 23 05:06:45 2010
@@ -234,7 +234,6 @@ public class ModelingViewProvider extend
 					}
 					break;
 				case AssignDataidEditPart.VISUAL_ID:
-				case AssignExprEditPart.VISUAL_ID:
 					if (AssignEditPart.VISUAL_ID != ModelingVisualIDRegistry
 							.getVisualID(containerView)
 							|| containerView.getElement() != domainElement) {
@@ -329,7 +328,6 @@ public class ModelingViewProvider extend
 					}
 					break;
 				case AssignDataid2EditPart.VISUAL_ID:
-				case AssignExpr2EditPart.VISUAL_ID:
 					if (Assign2EditPart.VISUAL_ID != ModelingVisualIDRegistry
 							.getVisualID(containerView)
 							|| containerView.getElement() != domainElement) {
@@ -628,8 +626,6 @@ public class ModelingViewProvider extend
 			return AssignViewFactory.class;
 		case AssignDataidEditPart.VISUAL_ID:
 			return AssignDataidViewFactory.class;
-		case AssignExprEditPart.VISUAL_ID:
-			return AssignExprViewFactory.class;
 		case RaiseEditPart.VISUAL_ID:
 			return RaiseViewFactory.class;
 		case RaiseEventEditPart.VISUAL_ID:
@@ -678,8 +674,6 @@ public class ModelingViewProvider extend
 			return Assign2ViewFactory.class;
 		case AssignDataid2EditPart.VISUAL_ID:
 			return AssignDataid2ViewFactory.class;
-		case AssignExpr2EditPart.VISUAL_ID:
-			return AssignExpr2ViewFactory.class;
 		case Raise2EditPart.VISUAL_ID:
 			return Raise2ViewFactory.class;
 		case RaiseEvent2EditPart.VISUAL_ID:

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Assign2ViewFactory.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/view/factories/Assign2ViewFactory.java?rev=947358&r1=947357&r2=947358&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/view/factories/Assign2ViewFactory.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/view/factories/Assign2ViewFactory.java Sun May 23 05:06:45 2010
@@ -69,12 +69,5 @@ public class Assign2ViewFactory extends 
 				ModelingVisualIDRegistry
 						.getType(AssignDataid2EditPart.VISUAL_ID),
 				ViewUtil.APPEND, true, getPreferencesHint());
-		getViewService()
-				.createNode(
-						eObjectAdapter,
-						view,
-						ModelingVisualIDRegistry
-								.getType(AssignExpr2EditPart.VISUAL_ID),
-						ViewUtil.APPEND, true, getPreferencesHint());
 	}
 }

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignViewFactory.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/view/factories/AssignViewFactory.java?rev=947358&r1=947357&r2=947358&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/view/factories/AssignViewFactory.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/view/factories/AssignViewFactory.java Sun May 23 05:06:45 2010
@@ -69,8 +69,5 @@ public class AssignViewFactory extends A
 				ModelingVisualIDRegistry
 						.getType(AssignDataidEditPart.VISUAL_ID),
 				ViewUtil.APPEND, true, getPreferencesHint());
-		getViewService().createNode(eObjectAdapter, view,
-				ModelingVisualIDRegistry.getType(AssignExprEditPart.VISUAL_ID),
-				ViewUtil.APPEND, true, getPreferencesHint());
 	}
 }