commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gu...@apache.org
Subject svn commit: r945691 [28/39] - in /commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src: main/java/org.apache.commons.scxml.diagram/ main/java/org.apache.commons.scxml.diagram/META-INF/ main/java/org.apache.commons.scxml.diagram/icons/obj16/ main/java/org....
Date Tue, 18 May 2010 15:13:31 GMT
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/WrappingLabel6ViewFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/WrappingLabel6ViewFactory.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/WrappingLabel6ViewFactory.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.diagram/src/org/apache/commons/scxml/modeling/diagram/view/factories/WrappingLabel6ViewFactory.java Tue May 18 15:13:13 2010
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *    http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.apache.commons.scxml.modeling.diagram.view.factories;
 
 import java.util.ArrayList;

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

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

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

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

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/META-INF/MANIFEST.MF?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/META-INF/MANIFEST.MF (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/META-INF/MANIFEST.MF Tue May 18 15:13:13 2010
@@ -4,7 +4,7 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.apache.commons.scxml.modeling.edit;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-ClassPath: .
-Bundle-Activator: org.apache.commons.scxml.modeling.provider.ScxmlEditPlugin$Implementation
+Bundle-Activator: org.apache.commons.scxml.modeling.provider.ModelingEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.apache.commons.scxml.modeling.provider

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/build.properties
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/build.properties?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/build.properties (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/build.properties Tue May 18 15:13:13 2010
@@ -1,18 +1,6 @@
-# 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.
-# 
+
+# <copyright>
+# </copyright>
 #
 # $Id$
 

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/plugin.properties
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/plugin.properties?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/plugin.properties (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/plugin.properties Tue May 18 15:13:13 2010
@@ -1,22 +1,10 @@
-# 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.
-# 
+
+# <copyright>
+# </copyright>
 #
 # $Id$
 
-pluginName = Scxml Edit Support
+pluginName = Modeling Edit Support
 providerName = www.example.org
 
 _UI_CreateChild_text = {0}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/plugin.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/plugin.xml?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/plugin.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/plugin.xml Tue May 18 15:13:13 2010
@@ -2,21 +2,8 @@
 <?eclipse version="3.0"?>
 
 <!--
- 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.
- 
+ <copyright>
+ </copyright>
 
  $Id$
 -->
@@ -26,7 +13,7 @@
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <factory
             uri="org.apache.commons.scxml"
-            class="org.apache.commons.scxml.modeling.provider.ScxmlItemProviderAdapterFactory"
+            class="org.apache.commons.scxml.modeling.provider.ModelingItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
                org.eclipse.emf.edit.provider.IStructuredItemContentProvider

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/AnchorItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/AnchorItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/AnchorItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/AnchorItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -24,7 +11,7 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.Anchor;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -94,7 +81,7 @@ public class AnchorItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Anchor_type_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Anchor_type_feature", "_UI_Anchor_type"),
-				 ScxmlPackage.Literals.ANCHOR__TYPE,
+				 ModelingPackage.Literals.ANCHOR__TYPE,
 				 true,
 				 false,
 				 false,
@@ -116,7 +103,7 @@ public class AnchorItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Anchor_snapshot_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Anchor_snapshot_feature", "_UI_Anchor_type"),
-				 ScxmlPackage.Literals.ANCHOR__SNAPSHOT,
+				 ModelingPackage.Literals.ANCHOR__SNAPSHOT,
 				 true,
 				 false,
 				 false,
@@ -159,8 +146,8 @@ public class AnchorItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Anchor.class)) {
-			case ScxmlPackage.ANCHOR__TYPE:
-			case ScxmlPackage.ANCHOR__SNAPSHOT:
+			case ModelingPackage.ANCHOR__TYPE:
+			case ModelingPackage.ANCHOR__SNAPSHOT:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
@@ -185,7 +172,7 @@ public class AnchorItemProvider
 	 * @generated
 	 */
 	public ResourceLocator getResourceLocator() {
-		return ScxmlEditPlugin.INSTANCE;
+		return ModelingEditPlugin.INSTANCE;
 	}
 
 }

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/AssignItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/AssignItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/AssignItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/AssignItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -24,7 +11,7 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.Assign;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -92,7 +79,7 @@ public class AssignItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Assign_location_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Assign_location_feature", "_UI_Assign_type"),
-				 ScxmlPackage.Literals.ASSIGN__LOCATION,
+				 ModelingPackage.Literals.ASSIGN__LOCATION,
 				 true,
 				 false,
 				 false,
@@ -114,7 +101,7 @@ public class AssignItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Assign_dataid_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Assign_dataid_feature", "_UI_Assign_type"),
-				 ScxmlPackage.Literals.ASSIGN__DATAID,
+				 ModelingPackage.Literals.ASSIGN__DATAID,
 				 true,
 				 false,
 				 false,
@@ -136,7 +123,7 @@ public class AssignItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Assign_expr_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Assign_expr_feature", "_UI_Assign_type"),
-				 ScxmlPackage.Literals.ASSIGN__EXPR,
+				 ModelingPackage.Literals.ASSIGN__EXPR,
 				 true,
 				 false,
 				 false,
@@ -179,9 +166,9 @@ public class AssignItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Assign.class)) {
-			case ScxmlPackage.ASSIGN__LOCATION:
-			case ScxmlPackage.ASSIGN__DATAID:
-			case ScxmlPackage.ASSIGN__EXPR:
+			case ModelingPackage.ASSIGN__LOCATION:
+			case ModelingPackage.ASSIGN__DATAID:
+			case ModelingPackage.ASSIGN__EXPR:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/CancelItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/CancelItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/CancelItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/CancelItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -24,7 +11,7 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.Cancel;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -91,7 +78,7 @@ public class CancelItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Cancel_sendid_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Cancel_sendid_feature", "_UI_Cancel_type"),
-				 ScxmlPackage.Literals.CANCEL__SENDID,
+				 ModelingPackage.Literals.CANCEL__SENDID,
 				 true,
 				 false,
 				 false,
@@ -113,7 +100,7 @@ public class CancelItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Cancel_sendidexpr_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Cancel_sendidexpr_feature", "_UI_Cancel_type"),
-				 ScxmlPackage.Literals.CANCEL__SENDIDEXPR,
+				 ModelingPackage.Literals.CANCEL__SENDIDEXPR,
 				 true,
 				 false,
 				 false,
@@ -156,8 +143,8 @@ public class CancelItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Cancel.class)) {
-			case ScxmlPackage.CANCEL__SENDID:
-			case ScxmlPackage.CANCEL__SENDIDEXPR:
+			case ModelingPackage.CANCEL__SENDID:
+			case ModelingPackage.CANCEL__SENDIDEXPR:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ContentItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ContentItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ContentItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ContentItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -24,8 +11,8 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.Content;
-import org.apache.commons.scxml.modeling.ScxmlFactory;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingFactory;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -91,7 +78,7 @@ public class ContentItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.CONTENT__CONTENT);
+			childrenFeatures.add(ModelingPackage.Literals.CONTENT__CONTENT);
 		}
 		return childrenFeatures;
 	}
@@ -139,7 +126,7 @@ public class ContentItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Content.class)) {
-			case ScxmlPackage.CONTENT__CONTENT:
+			case ModelingPackage.CONTENT__CONTENT:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -158,8 +145,8 @@ public class ContentItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.CONTENT__CONTENT,
-				 ScxmlFactory.eINSTANCE.createContent()));
+				(ModelingPackage.Literals.CONTENT__CONTENT,
+				 ModelingFactory.eINSTANCE.createContent()));
 	}
 
 	/**
@@ -169,7 +156,7 @@ public class ContentItemProvider
 	 * @generated
 	 */
 	public ResourceLocator getResourceLocator() {
-		return ScxmlEditPlugin.INSTANCE;
+		return ModelingEditPlugin.INSTANCE;
 	}
 
 }

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/DataItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/DataItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/DataItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/DataItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -24,8 +11,8 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.Data;
-import org.apache.commons.scxml.modeling.ScxmlFactory;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingFactory;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -98,7 +85,7 @@ public class DataItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Data_id_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Data_id_feature", "_UI_Data_type"),
-				 ScxmlPackage.Literals.DATA__ID,
+				 ModelingPackage.Literals.DATA__ID,
 				 true,
 				 false,
 				 false,
@@ -120,7 +107,7 @@ public class DataItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Data_src_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Data_src_feature", "_UI_Data_type"),
-				 ScxmlPackage.Literals.DATA__SRC,
+				 ModelingPackage.Literals.DATA__SRC,
 				 true,
 				 false,
 				 false,
@@ -142,7 +129,7 @@ public class DataItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Data_expr_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Data_expr_feature", "_UI_Data_type"),
-				 ScxmlPackage.Literals.DATA__EXPR,
+				 ModelingPackage.Literals.DATA__EXPR,
 				 true,
 				 false,
 				 false,
@@ -162,7 +149,7 @@ public class DataItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.DATA__CONTENT);
+			childrenFeatures.add(ModelingPackage.Literals.DATA__CONTENT);
 		}
 		return childrenFeatures;
 	}
@@ -213,12 +200,12 @@ public class DataItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Data.class)) {
-			case ScxmlPackage.DATA__ID:
-			case ScxmlPackage.DATA__SRC:
-			case ScxmlPackage.DATA__EXPR:
+			case ModelingPackage.DATA__ID:
+			case ModelingPackage.DATA__SRC:
+			case ModelingPackage.DATA__EXPR:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ScxmlPackage.DATA__CONTENT:
+			case ModelingPackage.DATA__CONTENT:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -237,8 +224,8 @@ public class DataItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.DATA__CONTENT,
-				 ScxmlFactory.eINSTANCE.createContent()));
+				(ModelingPackage.Literals.DATA__CONTENT,
+				 ModelingFactory.eINSTANCE.createContent()));
 	}
 
 	/**
@@ -248,7 +235,7 @@ public class DataItemProvider
 	 * @generated
 	 */
 	public ResourceLocator getResourceLocator() {
-		return ScxmlEditPlugin.INSTANCE;
+		return ModelingEditPlugin.INSTANCE;
 	}
 
 }

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/DataModelItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/DataModelItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/DataModelItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/DataModelItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -24,8 +11,8 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.DataModel;
-import org.apache.commons.scxml.modeling.ScxmlFactory;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingFactory;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -96,7 +83,7 @@ public class DataModelItemProvider
 				 getResourceLocator(),
 				 getString("_UI_DataModel_schema_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_DataModel_schema_feature", "_UI_DataModel_type"),
-				 ScxmlPackage.Literals.DATA_MODEL__SCHEMA,
+				 ModelingPackage.Literals.DATA_MODEL__SCHEMA,
 				 true,
 				 false,
 				 false,
@@ -116,7 +103,7 @@ public class DataModelItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.DATA_MODEL__DATA);
+			childrenFeatures.add(ModelingPackage.Literals.DATA_MODEL__DATA);
 		}
 		return childrenFeatures;
 	}
@@ -167,10 +154,10 @@ public class DataModelItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(DataModel.class)) {
-			case ScxmlPackage.DATA_MODEL__SCHEMA:
+			case ModelingPackage.DATA_MODEL__SCHEMA:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ScxmlPackage.DATA_MODEL__DATA:
+			case ModelingPackage.DATA_MODEL__DATA:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -189,8 +176,8 @@ public class DataModelItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.DATA_MODEL__DATA,
-				 ScxmlFactory.eINSTANCE.createData()));
+				(ModelingPackage.Literals.DATA_MODEL__DATA,
+				 ModelingFactory.eINSTANCE.createData()));
 	}
 
 	/**
@@ -200,7 +187,7 @@ public class DataModelItemProvider
 	 * @generated
 	 */
 	public ResourceLocator getResourceLocator() {
-		return ScxmlEditPlugin.INSTANCE;
+		return ModelingEditPlugin.INSTANCE;
 	}
 
 }

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/DonedataItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/DonedataItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/DonedataItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/DonedataItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -24,8 +11,8 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.Donedata;
-import org.apache.commons.scxml.modeling.ScxmlFactory;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingFactory;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -91,8 +78,8 @@ public class DonedataItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.DONEDATA__CONTENT);
-			childrenFeatures.add(ScxmlPackage.Literals.DONEDATA__PARAM);
+			childrenFeatures.add(ModelingPackage.Literals.DONEDATA__CONTENT);
+			childrenFeatures.add(ModelingPackage.Literals.DONEDATA__PARAM);
 		}
 		return childrenFeatures;
 	}
@@ -140,8 +127,8 @@ public class DonedataItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Donedata.class)) {
-			case ScxmlPackage.DONEDATA__CONTENT:
-			case ScxmlPackage.DONEDATA__PARAM:
+			case ModelingPackage.DONEDATA__CONTENT:
+			case ModelingPackage.DONEDATA__PARAM:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -160,13 +147,13 @@ public class DonedataItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.DONEDATA__CONTENT,
-				 ScxmlFactory.eINSTANCE.createContent()));
+				(ModelingPackage.Literals.DONEDATA__CONTENT,
+				 ModelingFactory.eINSTANCE.createContent()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.DONEDATA__PARAM,
-				 ScxmlFactory.eINSTANCE.createParam()));
+				(ModelingPackage.Literals.DONEDATA__PARAM,
+				 ModelingFactory.eINSTANCE.createParam()));
 	}
 
 	/**
@@ -176,7 +163,7 @@ public class DonedataItemProvider
 	 * @generated
 	 */
 	public ResourceLocator getResourceLocator() {
-		return ScxmlEditPlugin.INSTANCE;
+		return ModelingEditPlugin.INSTANCE;
 	}
 
 }

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ElseIfItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ElseIfItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ElseIfItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ElseIfItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -24,7 +11,7 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.ElseIf;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -90,7 +77,7 @@ public class ElseIfItemProvider
 				 getResourceLocator(),
 				 getString("_UI_ElseIf_cond_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_ElseIf_cond_feature", "_UI_ElseIf_type"),
-				 ScxmlPackage.Literals.ELSE_IF__COND,
+				 ModelingPackage.Literals.ELSE_IF__COND,
 				 true,
 				 false,
 				 false,
@@ -133,7 +120,7 @@ public class ElseIfItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ElseIf.class)) {
-			case ScxmlPackage.ELSE_IF__COND:
+			case ModelingPackage.ELSE_IF__COND:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ElseItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ElseItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ElseItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ElseItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ExecutableContentItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ExecutableContentItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ExecutableContentItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ExecutableContentItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -123,7 +110,7 @@ public class ExecutableContentItemProvid
 	 * @generated
 	 */
 	public ResourceLocator getResourceLocator() {
-		return ScxmlEditPlugin.INSTANCE;
+		return ModelingEditPlugin.INSTANCE;
 	}
 
 }

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ExtenExecContentItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ExtenExecContentItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ExtenExecContentItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ExtenExecContentItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/FinalStateItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/FinalStateItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/FinalStateItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/FinalStateItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -24,8 +11,8 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.FinalState;
-import org.apache.commons.scxml.modeling.ScxmlFactory;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingFactory;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -93,7 +80,7 @@ public class FinalStateItemProvider
 				 getResourceLocator(),
 				 getString("_UI_FinalState_id_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_FinalState_id_feature", "_UI_FinalState_type"),
-				 ScxmlPackage.Literals.FINAL_STATE__ID,
+				 ModelingPackage.Literals.FINAL_STATE__ID,
 				 true,
 				 false,
 				 false,
@@ -113,9 +100,9 @@ public class FinalStateItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.FINAL_STATE__ON_ENTRY);
-			childrenFeatures.add(ScxmlPackage.Literals.FINAL_STATE__ON_EXIT);
-			childrenFeatures.add(ScxmlPackage.Literals.FINAL_STATE__DONEDATA);
+			childrenFeatures.add(ModelingPackage.Literals.FINAL_STATE__ON_ENTRY);
+			childrenFeatures.add(ModelingPackage.Literals.FINAL_STATE__ON_EXIT);
+			childrenFeatures.add(ModelingPackage.Literals.FINAL_STATE__DONEDATA);
 		}
 		return childrenFeatures;
 	}
@@ -166,12 +153,12 @@ public class FinalStateItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(FinalState.class)) {
-			case ScxmlPackage.FINAL_STATE__ID:
+			case ModelingPackage.FINAL_STATE__ID:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ScxmlPackage.FINAL_STATE__ON_ENTRY:
-			case ScxmlPackage.FINAL_STATE__ON_EXIT:
-			case ScxmlPackage.FINAL_STATE__DONEDATA:
+			case ModelingPackage.FINAL_STATE__ON_ENTRY:
+			case ModelingPackage.FINAL_STATE__ON_EXIT:
+			case ModelingPackage.FINAL_STATE__DONEDATA:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -190,18 +177,18 @@ public class FinalStateItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINAL_STATE__ON_ENTRY,
-				 ScxmlFactory.eINSTANCE.createOnEntry()));
+				(ModelingPackage.Literals.FINAL_STATE__ON_ENTRY,
+				 ModelingFactory.eINSTANCE.createOnEntry()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINAL_STATE__ON_EXIT,
-				 ScxmlFactory.eINSTANCE.createOnExit()));
+				(ModelingPackage.Literals.FINAL_STATE__ON_EXIT,
+				 ModelingFactory.eINSTANCE.createOnExit()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINAL_STATE__DONEDATA,
-				 ScxmlFactory.eINSTANCE.createDonedata()));
+				(ModelingPackage.Literals.FINAL_STATE__DONEDATA,
+				 ModelingFactory.eINSTANCE.createDonedata()));
 	}
 
 	/**
@@ -215,8 +202,8 @@ public class FinalStateItemProvider
 		Object childObject = child;
 
 		boolean qualify =
-			childFeature == ScxmlPackage.Literals.NAMED_ELEMENT__SOURCE_CONNECTION ||
-			childFeature == ScxmlPackage.Literals.NAMED_ELEMENT__TARGET_CONNECTION;
+			childFeature == ModelingPackage.Literals.NAMED_ELEMENT__SOURCE_CONNECTION ||
+			childFeature == ModelingPackage.Literals.NAMED_ELEMENT__TARGET_CONNECTION;
 
 		if (qualify) {
 			return getString

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/FinalizeItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/FinalizeItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/FinalizeItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/FinalizeItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -24,8 +11,8 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.Finalize;
-import org.apache.commons.scxml.modeling.ScxmlFactory;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingFactory;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -91,7 +78,7 @@ public class FinalizeItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.FINALIZE__EXECUTABLE_CONTENT);
+			childrenFeatures.add(ModelingPackage.Literals.FINALIZE__EXECUTABLE_CONTENT);
 		}
 		return childrenFeatures;
 	}
@@ -139,7 +126,7 @@ public class FinalizeItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Finalize.class)) {
-			case ScxmlPackage.FINALIZE__EXECUTABLE_CONTENT:
+			case ModelingPackage.FINALIZE__EXECUTABLE_CONTENT:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -158,63 +145,63 @@ public class FinalizeItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
-				 ScxmlFactory.eINSTANCE.createExecutableContent()));
+				(ModelingPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
+				 ModelingFactory.eINSTANCE.createExecutableContent()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
-				 ScxmlFactory.eINSTANCE.createAssign()));
+				(ModelingPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
+				 ModelingFactory.eINSTANCE.createAssign()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
-				 ScxmlFactory.eINSTANCE.createRaise()));
+				(ModelingPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
+				 ModelingFactory.eINSTANCE.createRaise()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
-				 ScxmlFactory.eINSTANCE.createIf()));
+				(ModelingPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
+				 ModelingFactory.eINSTANCE.createIf()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
-				 ScxmlFactory.eINSTANCE.createElseIf()));
+				(ModelingPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
+				 ModelingFactory.eINSTANCE.createElseIf()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
-				 ScxmlFactory.eINSTANCE.createElse()));
+				(ModelingPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
+				 ModelingFactory.eINSTANCE.createElse()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
-				 ScxmlFactory.eINSTANCE.createLog()));
+				(ModelingPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
+				 ModelingFactory.eINSTANCE.createLog()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
-				 ScxmlFactory.eINSTANCE.createExtenExecContent()));
+				(ModelingPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
+				 ModelingFactory.eINSTANCE.createExtenExecContent()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
-				 ScxmlFactory.eINSTANCE.createValidate()));
+				(ModelingPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
+				 ModelingFactory.eINSTANCE.createValidate()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
-				 ScxmlFactory.eINSTANCE.createParam()));
+				(ModelingPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
+				 ModelingFactory.eINSTANCE.createParam()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
-				 ScxmlFactory.eINSTANCE.createSend()));
+				(ModelingPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
+				 ModelingFactory.eINSTANCE.createSend()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
-				 ScxmlFactory.eINSTANCE.createCancel()));
+				(ModelingPackage.Literals.FINALIZE__EXECUTABLE_CONTENT,
+				 ModelingFactory.eINSTANCE.createCancel()));
 	}
 
 	/**
@@ -224,7 +211,7 @@ public class FinalizeItemProvider
 	 * @generated
 	 */
 	public ResourceLocator getResourceLocator() {
-		return ScxmlEditPlugin.INSTANCE;
+		return ModelingEditPlugin.INSTANCE;
 	}
 
 }

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/HistoryStateItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/HistoryStateItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/HistoryStateItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/HistoryStateItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -24,7 +11,7 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.HistoryState;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -91,7 +78,7 @@ public class HistoryStateItemProvider
 				 getResourceLocator(),
 				 getString("_UI_HistoryState_id_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_HistoryState_id_feature", "_UI_HistoryState_type"),
-				 ScxmlPackage.Literals.HISTORY_STATE__ID,
+				 ModelingPackage.Literals.HISTORY_STATE__ID,
 				 true,
 				 false,
 				 false,
@@ -113,7 +100,7 @@ public class HistoryStateItemProvider
 				 getResourceLocator(),
 				 getString("_UI_HistoryState_type_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_HistoryState_type_feature", "_UI_HistoryState_type"),
-				 ScxmlPackage.Literals.HISTORY_STATE__TYPE,
+				 ModelingPackage.Literals.HISTORY_STATE__TYPE,
 				 true,
 				 false,
 				 false,
@@ -156,8 +143,8 @@ public class HistoryStateItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(HistoryState.class)) {
-			case ScxmlPackage.HISTORY_STATE__ID:
-			case ScxmlPackage.HISTORY_STATE__TYPE:
+			case ModelingPackage.HISTORY_STATE__ID:
+			case ModelingPackage.HISTORY_STATE__TYPE:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
@@ -186,8 +173,8 @@ public class HistoryStateItemProvider
 		Object childObject = child;
 
 		boolean qualify =
-			childFeature == ScxmlPackage.Literals.NAMED_ELEMENT__SOURCE_CONNECTION ||
-			childFeature == ScxmlPackage.Literals.NAMED_ELEMENT__TARGET_CONNECTION;
+			childFeature == ModelingPackage.Literals.NAMED_ELEMENT__SOURCE_CONNECTION ||
+			childFeature == ModelingPackage.Literals.NAMED_ELEMENT__TARGET_CONNECTION;
 
 		if (qualify) {
 			return getString

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/IfItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/IfItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/IfItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/IfItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -24,8 +11,8 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.If;
-import org.apache.commons.scxml.modeling.ScxmlFactory;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingFactory;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -93,7 +80,7 @@ public class IfItemProvider
 				 getResourceLocator(),
 				 getString("_UI_If_cond_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_If_cond_feature", "_UI_If_type"),
-				 ScxmlPackage.Literals.IF__COND,
+				 ModelingPackage.Literals.IF__COND,
 				 true,
 				 false,
 				 false,
@@ -113,8 +100,8 @@ public class IfItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.IF__ELSEIF);
-			childrenFeatures.add(ScxmlPackage.Literals.IF__ELSE);
+			childrenFeatures.add(ModelingPackage.Literals.IF__ELSEIF);
+			childrenFeatures.add(ModelingPackage.Literals.IF__ELSE);
 		}
 		return childrenFeatures;
 	}
@@ -165,11 +152,11 @@ public class IfItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(If.class)) {
-			case ScxmlPackage.IF__COND:
+			case ModelingPackage.IF__COND:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ScxmlPackage.IF__ELSEIF:
-			case ScxmlPackage.IF__ELSE:
+			case ModelingPackage.IF__ELSEIF:
+			case ModelingPackage.IF__ELSE:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -188,13 +175,13 @@ public class IfItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.IF__ELSEIF,
-				 ScxmlFactory.eINSTANCE.createElseIf()));
+				(ModelingPackage.Literals.IF__ELSEIF,
+				 ModelingFactory.eINSTANCE.createElseIf()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.IF__ELSE,
-				 ScxmlFactory.eINSTANCE.createElse()));
+				(ModelingPackage.Literals.IF__ELSE,
+				 ModelingFactory.eINSTANCE.createElse()));
 	}
 
 }

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/InitialStateItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/InitialStateItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/InitialStateItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/InitialStateItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -23,7 +10,7 @@ package org.apache.commons.scxml.modelin
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -126,8 +113,8 @@ public class InitialStateItemProvider
 		Object childObject = child;
 
 		boolean qualify =
-			childFeature == ScxmlPackage.Literals.NAMED_ELEMENT__SOURCE_CONNECTION ||
-			childFeature == ScxmlPackage.Literals.NAMED_ELEMENT__TARGET_CONNECTION;
+			childFeature == ModelingPackage.Literals.NAMED_ELEMENT__SOURCE_CONNECTION ||
+			childFeature == ModelingPackage.Literals.NAMED_ELEMENT__TARGET_CONNECTION;
 
 		if (qualify) {
 			return getString

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/InvokeItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/InvokeItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/InvokeItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/InvokeItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -24,8 +11,8 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.Invoke;
-import org.apache.commons.scxml.modeling.ScxmlFactory;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingFactory;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -103,7 +90,7 @@ public class InvokeItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Invoke_type_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Invoke_type_feature", "_UI_Invoke_type"),
-				 ScxmlPackage.Literals.INVOKE__TYPE,
+				 ModelingPackage.Literals.INVOKE__TYPE,
 				 true,
 				 false,
 				 false,
@@ -125,7 +112,7 @@ public class InvokeItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Invoke_typeexpr_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Invoke_typeexpr_feature", "_UI_Invoke_type"),
-				 ScxmlPackage.Literals.INVOKE__TYPEEXPR,
+				 ModelingPackage.Literals.INVOKE__TYPEEXPR,
 				 true,
 				 false,
 				 false,
@@ -147,7 +134,7 @@ public class InvokeItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Invoke_src_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Invoke_src_feature", "_UI_Invoke_type"),
-				 ScxmlPackage.Literals.INVOKE__SRC,
+				 ModelingPackage.Literals.INVOKE__SRC,
 				 true,
 				 false,
 				 false,
@@ -169,7 +156,7 @@ public class InvokeItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Invoke_srcexpr_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Invoke_srcexpr_feature", "_UI_Invoke_type"),
-				 ScxmlPackage.Literals.INVOKE__SRCEXPR,
+				 ModelingPackage.Literals.INVOKE__SRCEXPR,
 				 true,
 				 false,
 				 false,
@@ -191,7 +178,7 @@ public class InvokeItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Invoke_id_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Invoke_id_feature", "_UI_Invoke_type"),
-				 ScxmlPackage.Literals.INVOKE__ID,
+				 ModelingPackage.Literals.INVOKE__ID,
 				 true,
 				 false,
 				 false,
@@ -213,7 +200,7 @@ public class InvokeItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Invoke_idlocation_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Invoke_idlocation_feature", "_UI_Invoke_type"),
-				 ScxmlPackage.Literals.INVOKE__IDLOCATION,
+				 ModelingPackage.Literals.INVOKE__IDLOCATION,
 				 true,
 				 false,
 				 false,
@@ -235,7 +222,7 @@ public class InvokeItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Invoke_namelist_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Invoke_namelist_feature", "_UI_Invoke_type"),
-				 ScxmlPackage.Literals.INVOKE__NAMELIST,
+				 ModelingPackage.Literals.INVOKE__NAMELIST,
 				 true,
 				 false,
 				 false,
@@ -257,7 +244,7 @@ public class InvokeItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Invoke_autoforward_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Invoke_autoforward_feature", "_UI_Invoke_type"),
-				 ScxmlPackage.Literals.INVOKE__AUTOFORWARD,
+				 ModelingPackage.Literals.INVOKE__AUTOFORWARD,
 				 true,
 				 false,
 				 false,
@@ -277,9 +264,9 @@ public class InvokeItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.INVOKE__CONTENT);
-			childrenFeatures.add(ScxmlPackage.Literals.INVOKE__PARAM);
-			childrenFeatures.add(ScxmlPackage.Literals.INVOKE__FINALIZE);
+			childrenFeatures.add(ModelingPackage.Literals.INVOKE__CONTENT);
+			childrenFeatures.add(ModelingPackage.Literals.INVOKE__PARAM);
+			childrenFeatures.add(ModelingPackage.Literals.INVOKE__FINALIZE);
 		}
 		return childrenFeatures;
 	}
@@ -330,19 +317,19 @@ public class InvokeItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Invoke.class)) {
-			case ScxmlPackage.INVOKE__TYPE:
-			case ScxmlPackage.INVOKE__TYPEEXPR:
-			case ScxmlPackage.INVOKE__SRC:
-			case ScxmlPackage.INVOKE__SRCEXPR:
-			case ScxmlPackage.INVOKE__ID:
-			case ScxmlPackage.INVOKE__IDLOCATION:
-			case ScxmlPackage.INVOKE__NAMELIST:
-			case ScxmlPackage.INVOKE__AUTOFORWARD:
+			case ModelingPackage.INVOKE__TYPE:
+			case ModelingPackage.INVOKE__TYPEEXPR:
+			case ModelingPackage.INVOKE__SRC:
+			case ModelingPackage.INVOKE__SRCEXPR:
+			case ModelingPackage.INVOKE__ID:
+			case ModelingPackage.INVOKE__IDLOCATION:
+			case ModelingPackage.INVOKE__NAMELIST:
+			case ModelingPackage.INVOKE__AUTOFORWARD:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ScxmlPackage.INVOKE__CONTENT:
-			case ScxmlPackage.INVOKE__PARAM:
-			case ScxmlPackage.INVOKE__FINALIZE:
+			case ModelingPackage.INVOKE__CONTENT:
+			case ModelingPackage.INVOKE__PARAM:
+			case ModelingPackage.INVOKE__FINALIZE:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -361,18 +348,18 @@ public class InvokeItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.INVOKE__CONTENT,
-				 ScxmlFactory.eINSTANCE.createContent()));
+				(ModelingPackage.Literals.INVOKE__CONTENT,
+				 ModelingFactory.eINSTANCE.createContent()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.INVOKE__PARAM,
-				 ScxmlFactory.eINSTANCE.createParam()));
+				(ModelingPackage.Literals.INVOKE__PARAM,
+				 ModelingFactory.eINSTANCE.createParam()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.INVOKE__FINALIZE,
-				 ScxmlFactory.eINSTANCE.createFinalize()));
+				(ModelingPackage.Literals.INVOKE__FINALIZE,
+				 ModelingFactory.eINSTANCE.createFinalize()));
 	}
 
 	/**
@@ -382,7 +369,7 @@ public class InvokeItemProvider
 	 * @generated
 	 */
 	public ResourceLocator getResourceLocator() {
-		return ScxmlEditPlugin.INSTANCE;
+		return ModelingEditPlugin.INSTANCE;
 	}
 
 }

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/LogItemProvider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/LogItemProvider.java?rev=945691&r1=945690&r2=945691&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/LogItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/LogItemProvider.java Tue May 18 15:13:13 2010
@@ -1,19 +1,6 @@
 /**
- * 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.
- * 
+ * <copyright>
+ * </copyright>
  *
  * $Id$
  */
@@ -24,7 +11,7 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.scxml.modeling.Log;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -92,7 +79,7 @@ public class LogItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Log_label_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Log_label_feature", "_UI_Log_type"),
-				 ScxmlPackage.Literals.LOG__LABEL,
+				 ModelingPackage.Literals.LOG__LABEL,
 				 true,
 				 false,
 				 false,
@@ -114,7 +101,7 @@ public class LogItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Log_expr_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Log_expr_feature", "_UI_Log_type"),
-				 ScxmlPackage.Literals.LOG__EXPR,
+				 ModelingPackage.Literals.LOG__EXPR,
 				 true,
 				 false,
 				 false,
@@ -136,7 +123,7 @@ public class LogItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Log_level_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Log_level_feature", "_UI_Log_type"),
-				 ScxmlPackage.Literals.LOG__LEVEL,
+				 ModelingPackage.Literals.LOG__LEVEL,
 				 true,
 				 false,
 				 false,
@@ -179,9 +166,9 @@ public class LogItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Log.class)) {
-			case ScxmlPackage.LOG__LABEL:
-			case ScxmlPackage.LOG__EXPR:
-			case ScxmlPackage.LOG__LEVEL:
+			case ModelingPackage.LOG__LABEL:
+			case ModelingPackage.LOG__EXPR:
+			case ModelingPackage.LOG__LEVEL:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}

Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ModelingEditPlugin.java
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ModelingEditPlugin.java?rev=945691&view=auto
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ModelingEditPlugin.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ModelingEditPlugin.java Tue May 18 15:13:13 2010
@@ -0,0 +1,92 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.commons.scxml.modeling.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+/**
+ * This is the central singleton for the Modeling edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class ModelingEditPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final ModelingEditPlugin INSTANCE = new ModelingEditPlugin();
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ModelingEditPlugin() {
+		super
+		  (new ResourceLocator [] {
+		   });
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public ResourceLocator getPluginResourceLocator() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public static Implementation getPlugin() {
+		return plugin;
+	}
+
+	/**
+	 * The actual implementation of the Eclipse <b>Plugin</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class Implementation extends EclipsePlugin {
+		/**
+		 * Creates an instance.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Implementation() {
+			super();
+
+			// Remember the static instance.
+			//
+			plugin = this;
+		}
+	}
+
+}

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



Mime
View raw message