commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gu...@apache.org
Subject svn commit: r960911 [13/15] - in /commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram: edit/commands/ edit/parts/ edit/policies/ navigator/ part/ providers/...
Date Tue, 06 Jul 2010 15:09:56 GMT
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/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=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/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 Tue Jul  6 15:09:51 2010
@@ -97,19 +97,18 @@ public class ModelingViewProvider extend
 				}
 				switch (visualID) {
 				case StateEditPart.VISUAL_ID:
-				case DataModelEditPart.VISUAL_ID:
 				case OnEntryEditPart.VISUAL_ID:
 				case IfEditPart.VISUAL_ID:
 				case ElseIfEditPart.VISUAL_ID:
 				case ElseEditPart.VISUAL_ID:
 				case AssignEditPart.VISUAL_ID:
 				case RaiseEditPart.VISUAL_ID:
+				case Param6EditPart.VISUAL_ID:
+				case Content6EditPart.VISUAL_ID:
 				case LogEditPart.VISUAL_ID:
 				case ValidateEditPart.VISUAL_ID:
 				case CancelEditPart.VISUAL_ID:
 				case SendEditPart.VISUAL_ID:
-				case ParamEditPart.VISUAL_ID:
-				case ContentEditPart.VISUAL_ID:
 				case Script2EditPart.VISUAL_ID:
 				case ExtenExecContentEditPart.VISUAL_ID:
 				case OnExitEditPart.VISUAL_ID:
@@ -118,14 +117,17 @@ public class ModelingViewProvider extend
 				case InitialState2EditPart.VISUAL_ID:
 				case HistoryStateEditPart.VISUAL_ID:
 				case Parallel2EditPart.VISUAL_ID:
-				case AnchorEditPart.VISUAL_ID:
 				case FinalState2EditPart.VISUAL_ID:
 				case DonedataEditPart.VISUAL_ID:
+				case DataModel2EditPart.VISUAL_ID:
 				case DataEditPart.VISUAL_ID:
 				case ScriptEditPart.VISUAL_ID:
 				case ParallelEditPart.VISUAL_ID:
+				case DataModelEditPart.VISUAL_ID:
 				case FinalStateEditPart.VISUAL_ID:
 				case Content2EditPart.VISUAL_ID:
+				case ParamEditPart.VISUAL_ID:
+				case ContentEditPart.VISUAL_ID:
 				case Param2EditPart.VISUAL_ID:
 				case If2EditPart.VISUAL_ID:
 				case Assign2EditPart.VISUAL_ID:
@@ -137,6 +139,16 @@ public class ModelingViewProvider extend
 				case Send2EditPart.VISUAL_ID:
 				case Script3EditPart.VISUAL_ID:
 				case ExtenExecContent2EditPart.VISUAL_ID:
+				case If3EditPart.VISUAL_ID:
+				case Assign3EditPart.VISUAL_ID:
+				case Raise3EditPart.VISUAL_ID:
+				case Log3EditPart.VISUAL_ID:
+				case Validate3EditPart.VISUAL_ID:
+				case Cancel3EditPart.VISUAL_ID:
+				case Send3EditPart.VISUAL_ID:
+				case Param7EditPart.VISUAL_ID:
+				case Script4EditPart.VISUAL_ID:
+				case ExtenExecContent3EditPart.VISUAL_ID:
 				case Param4EditPart.VISUAL_ID:
 				case Content3EditPart.VISUAL_ID:
 				case HistoryState2EditPart.VISUAL_ID:
@@ -144,13 +156,15 @@ public class ModelingViewProvider extend
 				case OnEntry2EditPart.VISUAL_ID:
 				case OnExit2EditPart.VISUAL_ID:
 				case State2EditPart.VISUAL_ID:
-				case Anchor2EditPart.VISUAL_ID:
 				case Param5EditPart.VISUAL_ID:
 				case Content4EditPart.VISUAL_ID:
 				case OnEntry3EditPart.VISUAL_ID:
 				case OnExit3EditPart.VISUAL_ID:
 				case State3EditPart.VISUAL_ID:
 				case Content5EditPart.VISUAL_ID:
+				case Finalize2EditPart.VISUAL_ID:
+				case Invoke2EditPart.VISUAL_ID:
+				case Finalize3EditPart.VISUAL_ID:
 					if (domainElement == null
 							|| visualID != ModelingVisualIDRegistry
 									.getNodeVisualID(containerView,
@@ -235,12 +249,34 @@ public class ModelingViewProvider extend
 					}
 					break;
 				case RaiseEventEditPart.VISUAL_ID:
+				case RaiseRaiseCompartmentEditPart.VISUAL_ID:
 					if (RaiseEditPart.VISUAL_ID != ModelingVisualIDRegistry
 							.getVisualID(containerView)
 							|| containerView.getElement() != domainElement) {
 						return null; // wrong container
 					}
 					break;
+				case ParamName6EditPart.VISUAL_ID:
+					if (Param6EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
+				case ContentContentCompartment6EditPart.VISUAL_ID:
+					if (Content6EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
+				case ContentContentCompartment2EditPart.VISUAL_ID:
+					if (Content2EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
 				case LogExprEditPart.VISUAL_ID:
 					if (LogEditPart.VISUAL_ID != ModelingVisualIDRegistry
 							.getVisualID(containerView)
@@ -284,13 +320,6 @@ public class ModelingViewProvider extend
 						return null; // wrong container
 					}
 					break;
-				case ContentContentCompartment2EditPart.VISUAL_ID:
-					if (Content2EditPart.VISUAL_ID != ModelingVisualIDRegistry
-							.getVisualID(containerView)
-							|| containerView.getElement() != domainElement) {
-						return null; // wrong container
-					}
-					break;
 				case ParamName2EditPart.VISUAL_ID:
 					if (Param2EditPart.VISUAL_ID != ModelingVisualIDRegistry
 							.getVisualID(containerView)
@@ -336,6 +365,7 @@ public class ModelingViewProvider extend
 					}
 					break;
 				case RaiseEvent2EditPart.VISUAL_ID:
+				case RaiseRaiseCompartment2EditPart.VISUAL_ID:
 					if (Raise2EditPart.VISUAL_ID != ModelingVisualIDRegistry
 							.getVisualID(containerView)
 							|| containerView.getElement() != domainElement) {
@@ -401,12 +431,86 @@ public class ModelingViewProvider extend
 					}
 					break;
 				case WrappingLabel8EditPart.VISUAL_ID:
+				case FinalizeFinalizeCompartmentEditPart.VISUAL_ID:
 					if (FinalizeEditPart.VISUAL_ID != ModelingVisualIDRegistry
 							.getVisualID(containerView)
 							|| containerView.getElement() != domainElement) {
 						return null; // wrong container
 					}
 					break;
+				case IfCond3EditPart.VISUAL_ID:
+				case IfIfCompartment3EditPart.VISUAL_ID:
+					if (If3EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
+				case AssignDataid3EditPart.VISUAL_ID:
+					if (Assign3EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
+				case RaiseEvent3EditPart.VISUAL_ID:
+				case RaiseRaiseCompartment3EditPart.VISUAL_ID:
+					if (Raise3EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
+				case LogExpr3EditPart.VISUAL_ID:
+					if (Log3EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
+				case ValidateSchema3EditPart.VISUAL_ID:
+					if (Validate3EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
+				case CancelSendid3EditPart.VISUAL_ID:
+					if (Cancel3EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
+				case SendEvent3EditPart.VISUAL_ID:
+				case SendSendCompartment3EditPart.VISUAL_ID:
+					if (Send3EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
+				case ParamName7EditPart.VISUAL_ID:
+					if (Param7EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
+				case WrappingLabelEditPart.VISUAL_ID:
+					if (Script4EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
+				case WrappingLabel17EditPart.VISUAL_ID:
+					if (ExtenExecContent3EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
 				case ParamName4EditPart.VISUAL_ID:
 					if (Param4EditPart.VISUAL_ID != ModelingVisualIDRegistry
 							.getVisualID(containerView)
@@ -450,13 +554,6 @@ public class ModelingViewProvider extend
 						return null; // wrong container
 					}
 					break;
-				case AnchorTypeEditPart.VISUAL_ID:
-					if (AnchorEditPart.VISUAL_ID != ModelingVisualIDRegistry
-							.getVisualID(containerView)
-							|| containerView.getElement() != domainElement) {
-						return null; // wrong container
-					}
-					break;
 				case ParallelId3EditPart.VISUAL_ID:
 				case ParallelParallelCompartment2EditPart.VISUAL_ID:
 					if (Parallel3EditPart.VISUAL_ID != ModelingVisualIDRegistry
@@ -489,13 +586,6 @@ public class ModelingViewProvider extend
 						return null; // wrong container
 					}
 					break;
-				case AnchorType2EditPart.VISUAL_ID:
-					if (Anchor2EditPart.VISUAL_ID != ModelingVisualIDRegistry
-							.getVisualID(containerView)
-							|| containerView.getElement() != domainElement) {
-						return null; // wrong container
-					}
-					break;
 				case FinalStateId2EditPart.VISUAL_ID:
 				case FinalStateFinalStateCompartmentEditPart.VISUAL_ID:
 					if (FinalState2EditPart.VISUAL_ID != ModelingVisualIDRegistry
@@ -550,6 +640,14 @@ public class ModelingViewProvider extend
 						return null; // wrong container
 					}
 					break;
+				case DataModelSchema2EditPart.VISUAL_ID:
+				case DataModelDataModelCompartment2EditPart.VISUAL_ID:
+					if (DataModel2EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
 				case DataIdEditPart.VISUAL_ID:
 				case DataDataCompartmentEditPart.VISUAL_ID:
 					if (DataEditPart.VISUAL_ID != ModelingVisualIDRegistry
@@ -565,6 +663,30 @@ public class ModelingViewProvider extend
 						return null; // wrong container
 					}
 					break;
+				case WrappingLabel18EditPart.VISUAL_ID:
+				case FinalizeFinalizeCompartment2EditPart.VISUAL_ID:
+					if (Finalize2EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
+				case InvokeType2EditPart.VISUAL_ID:
+				case InvokeInvokeCompartment2EditPart.VISUAL_ID:
+					if (Invoke2EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
+				case WrappingLabel19EditPart.VISUAL_ID:
+				case FinalizeFinalizeCompartment3EditPart.VISUAL_ID:
+					if (Finalize3EditPart.VISUAL_ID != ModelingVisualIDRegistry
+							.getVisualID(containerView)
+							|| containerView.getElement() != domainElement) {
+						return null; // wrong container
+					}
+					break;
 				case TransitionCondEditPart.VISUAL_ID:
 					if (TransitionEditPart.VISUAL_ID != ModelingVisualIDRegistry
 							.getVisualID(containerView)
@@ -634,6 +756,14 @@ public class ModelingViewProvider extend
 			return RaiseViewFactory.class;
 		case RaiseEventEditPart.VISUAL_ID:
 			return RaiseEventViewFactory.class;
+		case Param6EditPart.VISUAL_ID:
+			return Param6ViewFactory.class;
+		case ParamName6EditPart.VISUAL_ID:
+			return ParamName6ViewFactory.class;
+		case Content6EditPart.VISUAL_ID:
+			return Content6ViewFactory.class;
+		case Content2EditPart.VISUAL_ID:
+			return Content2ViewFactory.class;
 		case LogEditPart.VISUAL_ID:
 			return LogViewFactory.class;
 		case LogExprEditPart.VISUAL_ID:
@@ -656,8 +786,6 @@ public class ModelingViewProvider extend
 			return ParamNameViewFactory.class;
 		case ContentEditPart.VISUAL_ID:
 			return ContentViewFactory.class;
-		case Content2EditPart.VISUAL_ID:
-			return Content2ViewFactory.class;
 		case Param2EditPart.VISUAL_ID:
 			return Param2ViewFactory.class;
 		case ParamName2EditPart.VISUAL_ID:
@@ -722,6 +850,46 @@ public class ModelingViewProvider extend
 			return FinalizeViewFactory.class;
 		case WrappingLabel8EditPart.VISUAL_ID:
 			return WrappingLabel8ViewFactory.class;
+		case If3EditPart.VISUAL_ID:
+			return If3ViewFactory.class;
+		case IfCond3EditPart.VISUAL_ID:
+			return IfCond3ViewFactory.class;
+		case Assign3EditPart.VISUAL_ID:
+			return Assign3ViewFactory.class;
+		case AssignDataid3EditPart.VISUAL_ID:
+			return AssignDataid3ViewFactory.class;
+		case Raise3EditPart.VISUAL_ID:
+			return Raise3ViewFactory.class;
+		case RaiseEvent3EditPart.VISUAL_ID:
+			return RaiseEvent3ViewFactory.class;
+		case Log3EditPart.VISUAL_ID:
+			return Log3ViewFactory.class;
+		case LogExpr3EditPart.VISUAL_ID:
+			return LogExpr3ViewFactory.class;
+		case Validate3EditPart.VISUAL_ID:
+			return Validate3ViewFactory.class;
+		case ValidateSchema3EditPart.VISUAL_ID:
+			return ValidateSchema3ViewFactory.class;
+		case Cancel3EditPart.VISUAL_ID:
+			return Cancel3ViewFactory.class;
+		case CancelSendid3EditPart.VISUAL_ID:
+			return CancelSendid3ViewFactory.class;
+		case Send3EditPart.VISUAL_ID:
+			return Send3ViewFactory.class;
+		case SendEvent3EditPart.VISUAL_ID:
+			return SendEvent3ViewFactory.class;
+		case Param7EditPart.VISUAL_ID:
+			return Param7ViewFactory.class;
+		case ParamName7EditPart.VISUAL_ID:
+			return ParamName7ViewFactory.class;
+		case Script4EditPart.VISUAL_ID:
+			return Script4ViewFactory.class;
+		case WrappingLabelEditPart.VISUAL_ID:
+			return WrappingLabelViewFactory.class;
+		case ExtenExecContent3EditPart.VISUAL_ID:
+			return ExtenExecContent3ViewFactory.class;
+		case WrappingLabel17EditPart.VISUAL_ID:
+			return WrappingLabel17ViewFactory.class;
 		case Param4EditPart.VISUAL_ID:
 			return Param4ViewFactory.class;
 		case ParamName4EditPart.VISUAL_ID:
@@ -744,10 +912,6 @@ public class ModelingViewProvider extend
 			return HistoryState2ViewFactory.class;
 		case HistoryStateId2EditPart.VISUAL_ID:
 			return HistoryStateId2ViewFactory.class;
-		case AnchorEditPart.VISUAL_ID:
-			return AnchorViewFactory.class;
-		case AnchorTypeEditPart.VISUAL_ID:
-			return AnchorTypeViewFactory.class;
 		case Parallel3EditPart.VISUAL_ID:
 			return Parallel3ViewFactory.class;
 		case ParallelId3EditPart.VISUAL_ID:
@@ -764,10 +928,6 @@ public class ModelingViewProvider extend
 			return State2ViewFactory.class;
 		case StateId2EditPart.VISUAL_ID:
 			return StateId2ViewFactory.class;
-		case Anchor2EditPart.VISUAL_ID:
-			return Anchor2ViewFactory.class;
-		case AnchorType2EditPart.VISUAL_ID:
-			return AnchorType2ViewFactory.class;
 		case FinalState2EditPart.VISUAL_ID:
 			return FinalState2ViewFactory.class;
 		case FinalStateId2EditPart.VISUAL_ID:
@@ -794,32 +954,62 @@ public class ModelingViewProvider extend
 			return State3ViewFactory.class;
 		case StateId3EditPart.VISUAL_ID:
 			return StateId3ViewFactory.class;
+		case DataModel2EditPart.VISUAL_ID:
+			return DataModel2ViewFactory.class;
+		case DataModelSchema2EditPart.VISUAL_ID:
+			return DataModelSchema2ViewFactory.class;
 		case DataEditPart.VISUAL_ID:
 			return DataViewFactory.class;
 		case DataIdEditPart.VISUAL_ID:
 			return DataIdViewFactory.class;
 		case Content5EditPart.VISUAL_ID:
 			return Content5ViewFactory.class;
+		case Finalize2EditPart.VISUAL_ID:
+			return Finalize2ViewFactory.class;
+		case WrappingLabel18EditPart.VISUAL_ID:
+			return WrappingLabel18ViewFactory.class;
+		case Invoke2EditPart.VISUAL_ID:
+			return Invoke2ViewFactory.class;
+		case InvokeType2EditPart.VISUAL_ID:
+			return InvokeType2ViewFactory.class;
+		case Finalize3EditPart.VISUAL_ID:
+			return Finalize3ViewFactory.class;
+		case WrappingLabel19EditPart.VISUAL_ID:
+			return WrappingLabel19ViewFactory.class;
 		case StateStateCompartmentEditPart.VISUAL_ID:
 			return StateStateCompartmentViewFactory.class;
 		case OnEntryOnEntryCompartmentEditPart.VISUAL_ID:
 			return OnEntryOnEntryCompartmentViewFactory.class;
 		case IfIfCompartmentEditPart.VISUAL_ID:
 			return IfIfCompartmentViewFactory.class;
+		case RaiseRaiseCompartmentEditPart.VISUAL_ID:
+			return RaiseRaiseCompartmentViewFactory.class;
+		case ContentContentCompartment6EditPart.VISUAL_ID:
+			return ContentContentCompartment6ViewFactory.class;
+		case ContentContentCompartment2EditPart.VISUAL_ID:
+			return ContentContentCompartment2ViewFactory.class;
 		case SendSendCompartmentEditPart.VISUAL_ID:
 			return SendSendCompartmentViewFactory.class;
 		case ContentContentCompartmentEditPart.VISUAL_ID:
 			return ContentContentCompartmentViewFactory.class;
-		case ContentContentCompartment2EditPart.VISUAL_ID:
-			return ContentContentCompartment2ViewFactory.class;
 		case OnExitOnExitCompartmentEditPart.VISUAL_ID:
 			return OnExitOnExitCompartmentViewFactory.class;
 		case IfIfCompartment2EditPart.VISUAL_ID:
 			return IfIfCompartment2ViewFactory.class;
+		case RaiseRaiseCompartment2EditPart.VISUAL_ID:
+			return RaiseRaiseCompartment2ViewFactory.class;
 		case SendSendCompartment2EditPart.VISUAL_ID:
 			return SendSendCompartment2ViewFactory.class;
 		case InvokeInvokeCompartmentEditPart.VISUAL_ID:
 			return InvokeInvokeCompartmentViewFactory.class;
+		case FinalizeFinalizeCompartmentEditPart.VISUAL_ID:
+			return FinalizeFinalizeCompartmentViewFactory.class;
+		case IfIfCompartment3EditPart.VISUAL_ID:
+			return IfIfCompartment3ViewFactory.class;
+		case RaiseRaiseCompartment3EditPart.VISUAL_ID:
+			return RaiseRaiseCompartment3ViewFactory.class;
+		case SendSendCompartment3EditPart.VISUAL_ID:
+			return SendSendCompartment3ViewFactory.class;
 		case ContentContentCompartment3EditPart.VISUAL_ID:
 			return ContentContentCompartment3ViewFactory.class;
 		case ParallelParallelCompartmentEditPart.VISUAL_ID:
@@ -844,14 +1034,22 @@ public class ModelingViewProvider extend
 			return OnExitOnExitCompartment3ViewFactory.class;
 		case StateStateCompartment3EditPart.VISUAL_ID:
 			return StateStateCompartment3ViewFactory.class;
-		case ParallelParallelCompartment3EditPart.VISUAL_ID:
-			return ParallelParallelCompartment3ViewFactory.class;
-		case DataModelDataModelCompartmentEditPart.VISUAL_ID:
-			return DataModelDataModelCompartmentViewFactory.class;
+		case DataModelDataModelCompartment2EditPart.VISUAL_ID:
+			return DataModelDataModelCompartment2ViewFactory.class;
 		case DataDataCompartmentEditPart.VISUAL_ID:
 			return DataDataCompartmentViewFactory.class;
 		case ContentContentCompartment5EditPart.VISUAL_ID:
 			return ContentContentCompartment5ViewFactory.class;
+		case FinalizeFinalizeCompartment2EditPart.VISUAL_ID:
+			return FinalizeFinalizeCompartment2ViewFactory.class;
+		case InvokeInvokeCompartment2EditPart.VISUAL_ID:
+			return InvokeInvokeCompartment2ViewFactory.class;
+		case FinalizeFinalizeCompartment3EditPart.VISUAL_ID:
+			return FinalizeFinalizeCompartment3ViewFactory.class;
+		case ParallelParallelCompartment3EditPart.VISUAL_ID:
+			return ParallelParallelCompartment3ViewFactory.class;
+		case DataModelDataModelCompartmentEditPart.VISUAL_ID:
+			return DataModelDataModelCompartmentViewFactory.class;
 		case FinalStateFinalStateCompartment2EditPart.VISUAL_ID:
 			return FinalStateFinalStateCompartment2ViewFactory.class;
 		case TransitionCondEditPart.VISUAL_ID:

Added: 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/Assign3ViewFactory.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/Assign3ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Assign3ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Assign3ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,72 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Assign3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.AssignDataid3EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class Assign3ViewFactory extends AbstractShapeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createShapeStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(Assign3EditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		IAdaptable eObjectAdapter = null;
+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
+			eObjectAdapter = new EObjectAdapter(eObject);
+		}
+		getViewService().createNode(
+				eObjectAdapter,
+				view,
+				ModelingVisualIDRegistry
+						.getType(AssignDataid3EditPart.VISUAL_ID),
+				ViewUtil.APPEND, true, getPreferencesHint());
+	}
+}

Propchange: 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/Assign3ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/AssignDataid3ViewFactory.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/AssignDataid3ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataid3ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/AssignDataid3ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,37 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class AssignDataid3ViewFactory extends BasicNodeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		return styles;
+	}
+}

Propchange: 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/AssignDataid3ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/Cancel3ViewFactory.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/Cancel3ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Cancel3ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Cancel3ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,72 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Cancel3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.CancelSendid3EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class Cancel3ViewFactory extends AbstractShapeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createShapeStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(Cancel3EditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		IAdaptable eObjectAdapter = null;
+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
+			eObjectAdapter = new EObjectAdapter(eObject);
+		}
+		getViewService().createNode(
+				eObjectAdapter,
+				view,
+				ModelingVisualIDRegistry
+						.getType(CancelSendid3EditPart.VISUAL_ID),
+				ViewUtil.APPEND, true, getPreferencesHint());
+	}
+}

Propchange: 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/Cancel3ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/CancelSendid3ViewFactory.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/CancelSendid3ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelSendid3ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/CancelSendid3ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,37 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class CancelSendid3ViewFactory extends BasicNodeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		return styles;
+	}
+}

Propchange: 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/CancelSendid3ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/Content6ViewFactory.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/Content6ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content6ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Content6ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,72 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Content6EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment6EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class Content6ViewFactory extends AbstractShapeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createShapeStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(Content6EditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		IAdaptable eObjectAdapter = null;
+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
+			eObjectAdapter = new EObjectAdapter(eObject);
+		}
+		getViewService().createNode(
+				eObjectAdapter,
+				view,
+				ModelingVisualIDRegistry
+						.getType(ContentContentCompartment6EditPart.VISUAL_ID),
+				ViewUtil.APPEND, true, getPreferencesHint());
+	}
+}

Propchange: 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/Content6ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/ContentContentCompartment6ViewFactory.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/ContentContentCompartment6ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment6ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ContentContentCompartment6ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,85 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ContentContentCompartment6EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
+import org.eclipse.gmf.runtime.notation.DrawerStyle;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.TitleStyle;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class ContentContentCompartment6ViewFactory extends BasicNodeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createSortingStyle());
+		styles.add(NotationFactory.eINSTANCE.createFilteringStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(ContentContentCompartment6EditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		setupCompartmentTitle(view);
+		setupCompartmentCollapsed(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setupCompartmentTitle(View view) {
+		TitleStyle titleStyle = (TitleStyle) view
+				.getStyle(NotationPackage.eINSTANCE.getTitleStyle());
+		if (titleStyle != null) {
+			titleStyle.setShowTitle(true);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setupCompartmentCollapsed(View view) {
+		DrawerStyle drawerStyle = (DrawerStyle) view
+				.getStyle(NotationPackage.eINSTANCE.getDrawerStyle());
+		if (drawerStyle != null) {
+			drawerStyle.setCollapsed(false);
+		}
+	}
+}

Propchange: 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/ContentContentCompartment6ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/DataModel2ViewFactory.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/DataModel2ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModel2ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModel2ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,80 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModel2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelDataModelCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelSchema2EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class DataModel2ViewFactory extends AbstractShapeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createShapeStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(DataModel2EditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		IAdaptable eObjectAdapter = null;
+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
+			eObjectAdapter = new EObjectAdapter(eObject);
+		}
+		getViewService().createNode(
+				eObjectAdapter,
+				view,
+				ModelingVisualIDRegistry
+						.getType(DataModelSchema2EditPart.VISUAL_ID),
+				ViewUtil.APPEND, true, getPreferencesHint());
+		getViewService()
+				.createNode(
+						eObjectAdapter,
+						view,
+						ModelingVisualIDRegistry
+								.getType(DataModelDataModelCompartment2EditPart.VISUAL_ID),
+						ViewUtil.APPEND, true, getPreferencesHint());
+	}
+}

Propchange: 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/DataModel2ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/DataModelDataModelCompartment2ViewFactory.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/DataModelDataModelCompartment2ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelDataModelCompartment2ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelDataModelCompartment2ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,87 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.DataModelDataModelCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
+import org.eclipse.gmf.runtime.notation.DrawerStyle;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.TitleStyle;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class DataModelDataModelCompartment2ViewFactory extends
+		BasicNodeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createDrawerStyle());
+		styles.add(NotationFactory.eINSTANCE.createSortingStyle());
+		styles.add(NotationFactory.eINSTANCE.createFilteringStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(DataModelDataModelCompartment2EditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		setupCompartmentTitle(view);
+		setupCompartmentCollapsed(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setupCompartmentTitle(View view) {
+		TitleStyle titleStyle = (TitleStyle) view
+				.getStyle(NotationPackage.eINSTANCE.getTitleStyle());
+		if (titleStyle != null) {
+			titleStyle.setShowTitle(true);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setupCompartmentCollapsed(View view) {
+		DrawerStyle drawerStyle = (DrawerStyle) view
+				.getStyle(NotationPackage.eINSTANCE.getDrawerStyle());
+		if (drawerStyle != null) {
+			drawerStyle.setCollapsed(false);
+		}
+	}
+}

Propchange: 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/DataModelDataModelCompartment2ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/DataModelSchema2ViewFactory.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/DataModelSchema2ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelSchema2ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/DataModelSchema2ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,37 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class DataModelSchema2ViewFactory extends BasicNodeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		return styles;
+	}
+}

Propchange: 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/DataModelSchema2ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/ExtenExecContent3ViewFactory.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/ExtenExecContent3ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ExtenExecContent3ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/ExtenExecContent3ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,72 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.ExtenExecContent3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.WrappingLabel17EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class ExtenExecContent3ViewFactory extends AbstractShapeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createShapeStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(ExtenExecContent3EditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		IAdaptable eObjectAdapter = null;
+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
+			eObjectAdapter = new EObjectAdapter(eObject);
+		}
+		getViewService().createNode(
+				eObjectAdapter,
+				view,
+				ModelingVisualIDRegistry
+						.getType(WrappingLabel17EditPart.VISUAL_ID),
+				ViewUtil.APPEND, true, getPreferencesHint());
+	}
+}

Propchange: 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/ExtenExecContent3ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/Finalize2ViewFactory.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/Finalize2ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Finalize2ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Finalize2ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,80 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Finalize2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeFinalizeCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.WrappingLabel18EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class Finalize2ViewFactory extends AbstractShapeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createShapeStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(Finalize2EditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		IAdaptable eObjectAdapter = null;
+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
+			eObjectAdapter = new EObjectAdapter(eObject);
+		}
+		getViewService().createNode(
+				eObjectAdapter,
+				view,
+				ModelingVisualIDRegistry
+						.getType(WrappingLabel18EditPart.VISUAL_ID),
+				ViewUtil.APPEND, true, getPreferencesHint());
+		getViewService()
+				.createNode(
+						eObjectAdapter,
+						view,
+						ModelingVisualIDRegistry
+								.getType(FinalizeFinalizeCompartment2EditPart.VISUAL_ID),
+						ViewUtil.APPEND, true, getPreferencesHint());
+	}
+}

Propchange: 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/Finalize2ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/Finalize3ViewFactory.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/Finalize3ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Finalize3ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/Finalize3ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,80 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.Finalize3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeFinalizeCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.WrappingLabel19EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class Finalize3ViewFactory extends AbstractShapeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createShapeStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(Finalize3EditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		IAdaptable eObjectAdapter = null;
+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
+			eObjectAdapter = new EObjectAdapter(eObject);
+		}
+		getViewService().createNode(
+				eObjectAdapter,
+				view,
+				ModelingVisualIDRegistry
+						.getType(WrappingLabel19EditPart.VISUAL_ID),
+				ViewUtil.APPEND, true, getPreferencesHint());
+		getViewService()
+				.createNode(
+						eObjectAdapter,
+						view,
+						ModelingVisualIDRegistry
+								.getType(FinalizeFinalizeCompartment3EditPart.VISUAL_ID),
+						ViewUtil.APPEND, true, getPreferencesHint());
+	}
+}

Propchange: 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/Finalize3ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/FinalizeFinalizeCompartment2ViewFactory.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/FinalizeFinalizeCompartment2ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/FinalizeFinalizeCompartment2ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/FinalizeFinalizeCompartment2ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,86 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeFinalizeCompartment2EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
+import org.eclipse.gmf.runtime.notation.DrawerStyle;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.TitleStyle;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class FinalizeFinalizeCompartment2ViewFactory extends
+		BasicNodeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createSortingStyle());
+		styles.add(NotationFactory.eINSTANCE.createFilteringStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(FinalizeFinalizeCompartment2EditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		setupCompartmentTitle(view);
+		setupCompartmentCollapsed(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setupCompartmentTitle(View view) {
+		TitleStyle titleStyle = (TitleStyle) view
+				.getStyle(NotationPackage.eINSTANCE.getTitleStyle());
+		if (titleStyle != null) {
+			titleStyle.setShowTitle(true);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setupCompartmentCollapsed(View view) {
+		DrawerStyle drawerStyle = (DrawerStyle) view
+				.getStyle(NotationPackage.eINSTANCE.getDrawerStyle());
+		if (drawerStyle != null) {
+			drawerStyle.setCollapsed(false);
+		}
+	}
+}

Propchange: 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/FinalizeFinalizeCompartment2ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/FinalizeFinalizeCompartment3ViewFactory.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/FinalizeFinalizeCompartment3ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/FinalizeFinalizeCompartment3ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/FinalizeFinalizeCompartment3ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,86 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeFinalizeCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
+import org.eclipse.gmf.runtime.notation.DrawerStyle;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.TitleStyle;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class FinalizeFinalizeCompartment3ViewFactory extends
+		BasicNodeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createSortingStyle());
+		styles.add(NotationFactory.eINSTANCE.createFilteringStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(FinalizeFinalizeCompartment3EditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		setupCompartmentTitle(view);
+		setupCompartmentCollapsed(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setupCompartmentTitle(View view) {
+		TitleStyle titleStyle = (TitleStyle) view
+				.getStyle(NotationPackage.eINSTANCE.getTitleStyle());
+		if (titleStyle != null) {
+			titleStyle.setShowTitle(true);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setupCompartmentCollapsed(View view) {
+		DrawerStyle drawerStyle = (DrawerStyle) view
+				.getStyle(NotationPackage.eINSTANCE.getDrawerStyle());
+		if (drawerStyle != null) {
+			drawerStyle.setCollapsed(false);
+		}
+	}
+}

Propchange: 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/FinalizeFinalizeCompartment3ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/FinalizeFinalizeCompartmentViewFactory.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/FinalizeFinalizeCompartmentViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/FinalizeFinalizeCompartmentViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/FinalizeFinalizeCompartmentViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,86 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeFinalizeCompartmentEditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
+import org.eclipse.gmf.runtime.notation.DrawerStyle;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.TitleStyle;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class FinalizeFinalizeCompartmentViewFactory extends
+		BasicNodeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createSortingStyle());
+		styles.add(NotationFactory.eINSTANCE.createFilteringStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(FinalizeFinalizeCompartmentEditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		setupCompartmentTitle(view);
+		setupCompartmentCollapsed(view);
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setupCompartmentTitle(View view) {
+		TitleStyle titleStyle = (TitleStyle) view
+				.getStyle(NotationPackage.eINSTANCE.getTitleStyle());
+		if (titleStyle != null) {
+			titleStyle.setShowTitle(true);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void setupCompartmentCollapsed(View view) {
+		DrawerStyle drawerStyle = (DrawerStyle) view
+				.getStyle(NotationPackage.eINSTANCE.getDrawerStyle());
+		if (drawerStyle != null) {
+			drawerStyle.setCollapsed(false);
+		}
+	}
+}

Propchange: 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/FinalizeFinalizeCompartmentViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/FinalizeViewFactory.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/FinalizeViewFactory.java?rev=960911&r1=960910&r2=960911&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/FinalizeViewFactory.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/FinalizeViewFactory.java Tue Jul  6 15:09:51 2010
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeEditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.FinalizeFinalizeCompartmentEditPart;
 import org.apache.commons.scxml.modeling.diagram.edit.parts.WrappingLabel8EditPart;
 import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
 import org.eclipse.core.runtime.IAdaptable;
@@ -68,5 +69,12 @@ public class FinalizeViewFactory extends
 				ModelingVisualIDRegistry
 						.getType(WrappingLabel8EditPart.VISUAL_ID),
 				ViewUtil.APPEND, true, getPreferencesHint());
+		getViewService()
+				.createNode(
+						eObjectAdapter,
+						view,
+						ModelingVisualIDRegistry
+								.getType(FinalizeFinalizeCompartmentEditPart.VISUAL_ID),
+						ViewUtil.APPEND, true, getPreferencesHint());
 	}
 }

Added: 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/If3ViewFactory.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/If3ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/If3ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/If3ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,76 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.scxml.modeling.diagram.edit.parts.If3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.IfCond3EditPart;
+import org.apache.commons.scxml.modeling.diagram.edit.parts.IfIfCompartment3EditPart;
+import org.apache.commons.scxml.modeling.diagram.part.ModelingVisualIDRegistry;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractShapeViewFactory;
+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class If3ViewFactory extends AbstractShapeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		styles.add(NotationFactory.eINSTANCE.createShapeStyle());
+		return styles;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void decorateView(View containerView, View view,
+			IAdaptable semanticAdapter, String semanticHint, int index,
+			boolean persisted) {
+		if (semanticHint == null) {
+			semanticHint = ModelingVisualIDRegistry
+					.getType(If3EditPart.VISUAL_ID);
+			view.setType(semanticHint);
+		}
+		super.decorateView(containerView, view, semanticAdapter, semanticHint,
+				index, persisted);
+		IAdaptable eObjectAdapter = null;
+		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
+		if (eObject != null) {
+			eObjectAdapter = new EObjectAdapter(eObject);
+		}
+		getViewService().createNode(eObjectAdapter, view,
+				ModelingVisualIDRegistry.getType(IfCond3EditPart.VISUAL_ID),
+				ViewUtil.APPEND, true, getPreferencesHint());
+		getViewService().createNode(
+				eObjectAdapter,
+				view,
+				ModelingVisualIDRegistry
+						.getType(IfIfCompartment3EditPart.VISUAL_ID),
+				ViewUtil.APPEND, true, getPreferencesHint());
+	}
+}

Propchange: 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/If3ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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/IfCond3ViewFactory.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/IfCond3ViewFactory.java?rev=960911&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/IfCond3ViewFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/IfCond3ViewFactory.java Tue Jul  6 15:09:51 2010
@@ -0,0 +1,37 @@
+/*
+ * 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.view.factories;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * @generated
+ */
+public class IfCond3ViewFactory extends BasicNodeViewFactory {
+
+	/**
+	 * @generated
+	 */
+	protected List createStyles(View view) {
+		List styles = new ArrayList();
+		return styles;
+	}
+}

Propchange: 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/IfCond3ViewFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message