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

svn commit: r945691 [29/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....

Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ModelingItemProviderAdapterFactory.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/ModelingItemProviderAdapterFactory.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/ModelingItemProviderAdapterFactory.java (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ModelingItemProviderAdapterFactory.java Tue May 18 15:13:13 2010
@@ -0,0 +1,866 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.commons.scxml.modeling.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.commons.scxml.modeling.util.ModelingAdapterFactory;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ModelingItemProviderAdapterFactory extends ModelingAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection supportedTypes = new ArrayList();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ModelingItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.NamedElement} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NamedElementItemProvider namedElementItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.NamedElement}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createNamedElementAdapter() {
+		if (namedElementItemProvider == null) {
+			namedElementItemProvider = new NamedElementItemProvider(this);
+		}
+
+		return namedElementItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.State} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StateItemProvider stateItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.State}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createStateAdapter() {
+		if (stateItemProvider == null) {
+			stateItemProvider = new StateItemProvider(this);
+		}
+
+		return stateItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Translation} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TranslationItemProvider translationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Translation}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createTranslationAdapter() {
+		if (translationItemProvider == null) {
+			translationItemProvider = new TranslationItemProvider(this);
+		}
+
+		return translationItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Assign} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AssignItemProvider assignItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Assign}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createAssignAdapter() {
+		if (assignItemProvider == null) {
+			assignItemProvider = new AssignItemProvider(this);
+		}
+
+		return assignItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.ServiceTemplate} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ServiceTemplateItemProvider serviceTemplateItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.ServiceTemplate}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createServiceTemplateAdapter() {
+		if (serviceTemplateItemProvider == null) {
+			serviceTemplateItemProvider = new ServiceTemplateItemProvider(this);
+		}
+
+		return serviceTemplateItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.ExecutableContent} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ExecutableContentItemProvider executableContentItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.ExecutableContent}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createExecutableContentAdapter() {
+		if (executableContentItemProvider == null) {
+			executableContentItemProvider = new ExecutableContentItemProvider(this);
+		}
+
+		return executableContentItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.OnEntry} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected OnEntryItemProvider onEntryItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.OnEntry}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createOnEntryAdapter() {
+		if (onEntryItemProvider == null) {
+			onEntryItemProvider = new OnEntryItemProvider(this);
+		}
+
+		return onEntryItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.OnExit} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected OnExitItemProvider onExitItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.OnExit}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createOnExitAdapter() {
+		if (onExitItemProvider == null) {
+			onExitItemProvider = new OnExitItemProvider(this);
+		}
+
+		return onExitItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.InitialState} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected InitialStateItemProvider initialStateItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.InitialState}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createInitialStateAdapter() {
+		if (initialStateItemProvider == null) {
+			initialStateItemProvider = new InitialStateItemProvider(this);
+		}
+
+		return initialStateItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.FinalState} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FinalStateItemProvider finalStateItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.FinalState}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createFinalStateAdapter() {
+		if (finalStateItemProvider == null) {
+			finalStateItemProvider = new FinalStateItemProvider(this);
+		}
+
+		return finalStateItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Parallel} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ParallelItemProvider parallelItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Parallel}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createParallelAdapter() {
+		if (parallelItemProvider == null) {
+			parallelItemProvider = new ParallelItemProvider(this);
+		}
+
+		return parallelItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.HistoryState} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected HistoryStateItemProvider historyStateItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.HistoryState}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createHistoryStateAdapter() {
+		if (historyStateItemProvider == null) {
+			historyStateItemProvider = new HistoryStateItemProvider(this);
+		}
+
+		return historyStateItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Raise} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected RaiseItemProvider raiseItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Raise}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createRaiseAdapter() {
+		if (raiseItemProvider == null) {
+			raiseItemProvider = new RaiseItemProvider(this);
+		}
+
+		return raiseItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.If} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IfItemProvider ifItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.If}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createIfAdapter() {
+		if (ifItemProvider == null) {
+			ifItemProvider = new IfItemProvider(this);
+		}
+
+		return ifItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.ElseIf} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ElseIfItemProvider elseIfItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.ElseIf}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createElseIfAdapter() {
+		if (elseIfItemProvider == null) {
+			elseIfItemProvider = new ElseIfItemProvider(this);
+		}
+
+		return elseIfItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Else} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ElseItemProvider elseItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Else}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createElseAdapter() {
+		if (elseItemProvider == null) {
+			elseItemProvider = new ElseItemProvider(this);
+		}
+
+		return elseItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Log} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected LogItemProvider logItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Log}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createLogAdapter() {
+		if (logItemProvider == null) {
+			logItemProvider = new LogItemProvider(this);
+		}
+
+		return logItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.ExtenExecContent} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ExtenExecContentItemProvider extenExecContentItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.ExtenExecContent}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createExtenExecContentAdapter() {
+		if (extenExecContentItemProvider == null) {
+			extenExecContentItemProvider = new ExtenExecContentItemProvider(this);
+		}
+
+		return extenExecContentItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.DataModel} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DataModelItemProvider dataModelItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.DataModel}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createDataModelAdapter() {
+		if (dataModelItemProvider == null) {
+			dataModelItemProvider = new DataModelItemProvider(this);
+		}
+
+		return dataModelItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Data} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DataItemProvider dataItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Data}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createDataAdapter() {
+		if (dataItemProvider == null) {
+			dataItemProvider = new DataItemProvider(this);
+		}
+
+		return dataItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Validate} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ValidateItemProvider validateItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Validate}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createValidateAdapter() {
+		if (validateItemProvider == null) {
+			validateItemProvider = new ValidateItemProvider(this);
+		}
+
+		return validateItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Param} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ParamItemProvider paramItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Param}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createParamAdapter() {
+		if (paramItemProvider == null) {
+			paramItemProvider = new ParamItemProvider(this);
+		}
+
+		return paramItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Script} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ScriptItemProvider scriptItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Script}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createScriptAdapter() {
+		if (scriptItemProvider == null) {
+			scriptItemProvider = new ScriptItemProvider(this);
+		}
+
+		return scriptItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Anchor} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AnchorItemProvider anchorItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Anchor}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createAnchorAdapter() {
+		if (anchorItemProvider == null) {
+			anchorItemProvider = new AnchorItemProvider(this);
+		}
+
+		return anchorItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Send} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected SendItemProvider sendItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Send}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createSendAdapter() {
+		if (sendItemProvider == null) {
+			sendItemProvider = new SendItemProvider(this);
+		}
+
+		return sendItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Cancel} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CancelItemProvider cancelItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Cancel}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createCancelAdapter() {
+		if (cancelItemProvider == null) {
+			cancelItemProvider = new CancelItemProvider(this);
+		}
+
+		return cancelItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Content} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ContentItemProvider contentItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Content}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createContentAdapter() {
+		if (contentItemProvider == null) {
+			contentItemProvider = new ContentItemProvider(this);
+		}
+
+		return contentItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Donedata} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DonedataItemProvider donedataItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Donedata}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createDonedataAdapter() {
+		if (donedataItemProvider == null) {
+			donedataItemProvider = new DonedataItemProvider(this);
+		}
+
+		return donedataItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Invoke} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected InvokeItemProvider invokeItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Invoke}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createInvokeAdapter() {
+		if (invokeItemProvider == null) {
+			invokeItemProvider = new InvokeItemProvider(this);
+		}
+
+		return invokeItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.apache.commons.scxml.modeling.Finalize} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FinalizeItemProvider finalizeItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.apache.commons.scxml.modeling.Finalize}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter createFinalizeAdapter() {
+		if (finalizeItemProvider == null) {
+			finalizeItemProvider = new FinalizeItemProvider(this);
+		}
+
+		return finalizeItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class) || (((Class)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void dispose() {
+		if (namedElementItemProvider != null) namedElementItemProvider.dispose();
+		if (stateItemProvider != null) stateItemProvider.dispose();
+		if (translationItemProvider != null) translationItemProvider.dispose();
+		if (assignItemProvider != null) assignItemProvider.dispose();
+		if (serviceTemplateItemProvider != null) serviceTemplateItemProvider.dispose();
+		if (executableContentItemProvider != null) executableContentItemProvider.dispose();
+		if (onEntryItemProvider != null) onEntryItemProvider.dispose();
+		if (onExitItemProvider != null) onExitItemProvider.dispose();
+		if (initialStateItemProvider != null) initialStateItemProvider.dispose();
+		if (finalStateItemProvider != null) finalStateItemProvider.dispose();
+		if (parallelItemProvider != null) parallelItemProvider.dispose();
+		if (historyStateItemProvider != null) historyStateItemProvider.dispose();
+		if (raiseItemProvider != null) raiseItemProvider.dispose();
+		if (ifItemProvider != null) ifItemProvider.dispose();
+		if (elseIfItemProvider != null) elseIfItemProvider.dispose();
+		if (elseItemProvider != null) elseItemProvider.dispose();
+		if (logItemProvider != null) logItemProvider.dispose();
+		if (extenExecContentItemProvider != null) extenExecContentItemProvider.dispose();
+		if (dataModelItemProvider != null) dataModelItemProvider.dispose();
+		if (dataItemProvider != null) dataItemProvider.dispose();
+		if (validateItemProvider != null) validateItemProvider.dispose();
+		if (paramItemProvider != null) paramItemProvider.dispose();
+		if (scriptItemProvider != null) scriptItemProvider.dispose();
+		if (anchorItemProvider != null) anchorItemProvider.dispose();
+		if (sendItemProvider != null) sendItemProvider.dispose();
+		if (cancelItemProvider != null) cancelItemProvider.dispose();
+		if (contentItemProvider != null) contentItemProvider.dispose();
+		if (donedataItemProvider != null) donedataItemProvider.dispose();
+		if (invokeItemProvider != null) invokeItemProvider.dispose();
+		if (finalizeItemProvider != null) finalizeItemProvider.dispose();
+	}
+
+}

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

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/NamedElementItemProvider.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/NamedElementItemProvider.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/NamedElementItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/NamedElementItemProvider.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,9 +10,9 @@ package org.apache.commons.scxml.modelin
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.commons.scxml.modeling.ModelingFactory;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.NamedElement;
-import org.apache.commons.scxml.modeling.ScxmlFactory;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -91,9 +78,9 @@ public class NamedElementItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.NAMED_ELEMENT__SOURCE_CONNECTION);
-			childrenFeatures.add(ScxmlPackage.Literals.NAMED_ELEMENT__TARGET_CONNECTION);
-			childrenFeatures.add(ScxmlPackage.Literals.NAMED_ELEMENT__DATA_MODEL);
+			childrenFeatures.add(ModelingPackage.Literals.NAMED_ELEMENT__SOURCE_CONNECTION);
+			childrenFeatures.add(ModelingPackage.Literals.NAMED_ELEMENT__TARGET_CONNECTION);
+			childrenFeatures.add(ModelingPackage.Literals.NAMED_ELEMENT__DATA_MODEL);
 		}
 		return childrenFeatures;
 	}
@@ -141,9 +128,9 @@ public class NamedElementItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(NamedElement.class)) {
-			case ScxmlPackage.NAMED_ELEMENT__SOURCE_CONNECTION:
-			case ScxmlPackage.NAMED_ELEMENT__TARGET_CONNECTION:
-			case ScxmlPackage.NAMED_ELEMENT__DATA_MODEL:
+			case ModelingPackage.NAMED_ELEMENT__SOURCE_CONNECTION:
+			case ModelingPackage.NAMED_ELEMENT__TARGET_CONNECTION:
+			case ModelingPackage.NAMED_ELEMENT__DATA_MODEL:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -162,18 +149,18 @@ public class NamedElementItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.NAMED_ELEMENT__SOURCE_CONNECTION,
-				 ScxmlFactory.eINSTANCE.createTranslation()));
+				(ModelingPackage.Literals.NAMED_ELEMENT__SOURCE_CONNECTION,
+				 ModelingFactory.eINSTANCE.createTranslation()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.NAMED_ELEMENT__TARGET_CONNECTION,
-				 ScxmlFactory.eINSTANCE.createTranslation()));
+				(ModelingPackage.Literals.NAMED_ELEMENT__TARGET_CONNECTION,
+				 ModelingFactory.eINSTANCE.createTranslation()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.NAMED_ELEMENT__DATA_MODEL,
-				 ScxmlFactory.eINSTANCE.createDataModel()));
+				(ModelingPackage.Literals.NAMED_ELEMENT__DATA_MODEL,
+				 ModelingFactory.eINSTANCE.createDataModel()));
 	}
 
 	/**
@@ -187,8 +174,8 @@ public class NamedElementItemProvider
 		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
@@ -205,7 +192,7 @@ public class NamedElementItemProvider
 	 * @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/OnEntryItemProvider.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/OnEntryItemProvider.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/OnEntryItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/OnEntryItemProvider.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,9 +10,9 @@ package org.apache.commons.scxml.modelin
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.commons.scxml.modeling.ModelingFactory;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.OnEntry;
-import org.apache.commons.scxml.modeling.ScxmlFactory;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -91,8 +78,8 @@ public class OnEntryItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT);
-			childrenFeatures.add(ScxmlPackage.Literals.ON_ENTRY__SCRIPT);
+			childrenFeatures.add(ModelingPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT);
+			childrenFeatures.add(ModelingPackage.Literals.ON_ENTRY__SCRIPT);
 		}
 		return childrenFeatures;
 	}
@@ -140,8 +127,8 @@ public class OnEntryItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(OnEntry.class)) {
-			case ScxmlPackage.ON_ENTRY__EXECUTABLE_CONTEXT:
-			case ScxmlPackage.ON_ENTRY__SCRIPT:
+			case ModelingPackage.ON_ENTRY__EXECUTABLE_CONTEXT:
+			case ModelingPackage.ON_ENTRY__SCRIPT:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -160,68 +147,68 @@ public class OnEntryItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createExecutableContent()));
+				(ModelingPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createExecutableContent()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createAssign()));
+				(ModelingPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createAssign()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createRaise()));
+				(ModelingPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createRaise()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createIf()));
+				(ModelingPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createIf()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createElseIf()));
+				(ModelingPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createElseIf()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createElse()));
+				(ModelingPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createElse()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createLog()));
+				(ModelingPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createLog()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createExtenExecContent()));
+				(ModelingPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createExtenExecContent()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createValidate()));
+				(ModelingPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createValidate()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createParam()));
+				(ModelingPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createParam()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createSend()));
+				(ModelingPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createSend()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createCancel()));
+				(ModelingPackage.Literals.ON_ENTRY__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createCancel()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_ENTRY__SCRIPT,
-				 ScxmlFactory.eINSTANCE.createScript()));
+				(ModelingPackage.Literals.ON_ENTRY__SCRIPT,
+				 ModelingFactory.eINSTANCE.createScript()));
 	}
 
 	/**
@@ -231,7 +218,7 @@ public class OnEntryItemProvider
 	 * @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/OnExitItemProvider.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/OnExitItemProvider.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/OnExitItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/OnExitItemProvider.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,9 +10,9 @@ package org.apache.commons.scxml.modelin
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.commons.scxml.modeling.ModelingFactory;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.OnExit;
-import org.apache.commons.scxml.modeling.ScxmlFactory;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -91,8 +78,8 @@ public class OnExitItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT);
-			childrenFeatures.add(ScxmlPackage.Literals.ON_EXIT__SCRIPT);
+			childrenFeatures.add(ModelingPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT);
+			childrenFeatures.add(ModelingPackage.Literals.ON_EXIT__SCRIPT);
 		}
 		return childrenFeatures;
 	}
@@ -140,8 +127,8 @@ public class OnExitItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(OnExit.class)) {
-			case ScxmlPackage.ON_EXIT__EXECUTABLE_CONTEXT:
-			case ScxmlPackage.ON_EXIT__SCRIPT:
+			case ModelingPackage.ON_EXIT__EXECUTABLE_CONTEXT:
+			case ModelingPackage.ON_EXIT__SCRIPT:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -160,68 +147,68 @@ public class OnExitItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createExecutableContent()));
+				(ModelingPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createExecutableContent()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createAssign()));
+				(ModelingPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createAssign()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createRaise()));
+				(ModelingPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createRaise()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createIf()));
+				(ModelingPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createIf()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createElseIf()));
+				(ModelingPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createElseIf()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createElse()));
+				(ModelingPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createElse()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createLog()));
+				(ModelingPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createLog()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createExtenExecContent()));
+				(ModelingPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createExtenExecContent()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createValidate()));
+				(ModelingPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createValidate()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createParam()));
+				(ModelingPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createParam()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createSend()));
+				(ModelingPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createSend()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
-				 ScxmlFactory.eINSTANCE.createCancel()));
+				(ModelingPackage.Literals.ON_EXIT__EXECUTABLE_CONTEXT,
+				 ModelingFactory.eINSTANCE.createCancel()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.ON_EXIT__SCRIPT,
-				 ScxmlFactory.eINSTANCE.createScript()));
+				(ModelingPackage.Literals.ON_EXIT__SCRIPT,
+				 ModelingFactory.eINSTANCE.createScript()));
 	}
 
 	/**
@@ -231,7 +218,7 @@ public class OnExitItemProvider
 	 * @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/ParallelItemProvider.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/ParallelItemProvider.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/ParallelItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ParallelItemProvider.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,9 +10,9 @@ package org.apache.commons.scxml.modelin
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.commons.scxml.modeling.ModelingFactory;
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.Parallel;
-import org.apache.commons.scxml.modeling.ScxmlFactory;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -93,7 +80,7 @@ public class ParallelItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Parallel_id_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Parallel_id_feature", "_UI_Parallel_type"),
-				 ScxmlPackage.Literals.PARALLEL__ID,
+				 ModelingPackage.Literals.PARALLEL__ID,
 				 true,
 				 false,
 				 false,
@@ -113,12 +100,12 @@ public class ParallelItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.PARALLEL__ON_ENTRY);
-			childrenFeatures.add(ScxmlPackage.Literals.PARALLEL__ON_EXIT);
-			childrenFeatures.add(ScxmlPackage.Literals.PARALLEL__PARALLEL);
-			childrenFeatures.add(ScxmlPackage.Literals.PARALLEL__STATE);
-			childrenFeatures.add(ScxmlPackage.Literals.PARALLEL__HISTORY_STATE);
-			childrenFeatures.add(ScxmlPackage.Literals.PARALLEL__ANCHOR);
+			childrenFeatures.add(ModelingPackage.Literals.PARALLEL__ON_ENTRY);
+			childrenFeatures.add(ModelingPackage.Literals.PARALLEL__ON_EXIT);
+			childrenFeatures.add(ModelingPackage.Literals.PARALLEL__PARALLEL);
+			childrenFeatures.add(ModelingPackage.Literals.PARALLEL__STATE);
+			childrenFeatures.add(ModelingPackage.Literals.PARALLEL__HISTORY_STATE);
+			childrenFeatures.add(ModelingPackage.Literals.PARALLEL__ANCHOR);
 		}
 		return childrenFeatures;
 	}
@@ -169,15 +156,15 @@ public class ParallelItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Parallel.class)) {
-			case ScxmlPackage.PARALLEL__ID:
+			case ModelingPackage.PARALLEL__ID:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ScxmlPackage.PARALLEL__ON_ENTRY:
-			case ScxmlPackage.PARALLEL__ON_EXIT:
-			case ScxmlPackage.PARALLEL__PARALLEL:
-			case ScxmlPackage.PARALLEL__STATE:
-			case ScxmlPackage.PARALLEL__HISTORY_STATE:
-			case ScxmlPackage.PARALLEL__ANCHOR:
+			case ModelingPackage.PARALLEL__ON_ENTRY:
+			case ModelingPackage.PARALLEL__ON_EXIT:
+			case ModelingPackage.PARALLEL__PARALLEL:
+			case ModelingPackage.PARALLEL__STATE:
+			case ModelingPackage.PARALLEL__HISTORY_STATE:
+			case ModelingPackage.PARALLEL__ANCHOR:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -196,33 +183,33 @@ public class ParallelItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.PARALLEL__ON_ENTRY,
-				 ScxmlFactory.eINSTANCE.createOnEntry()));
+				(ModelingPackage.Literals.PARALLEL__ON_ENTRY,
+				 ModelingFactory.eINSTANCE.createOnEntry()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.PARALLEL__ON_EXIT,
-				 ScxmlFactory.eINSTANCE.createOnExit()));
+				(ModelingPackage.Literals.PARALLEL__ON_EXIT,
+				 ModelingFactory.eINSTANCE.createOnExit()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.PARALLEL__PARALLEL,
-				 ScxmlFactory.eINSTANCE.createParallel()));
+				(ModelingPackage.Literals.PARALLEL__PARALLEL,
+				 ModelingFactory.eINSTANCE.createParallel()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.PARALLEL__STATE,
-				 ScxmlFactory.eINSTANCE.createState()));
+				(ModelingPackage.Literals.PARALLEL__STATE,
+				 ModelingFactory.eINSTANCE.createState()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.PARALLEL__HISTORY_STATE,
-				 ScxmlFactory.eINSTANCE.createHistoryState()));
+				(ModelingPackage.Literals.PARALLEL__HISTORY_STATE,
+				 ModelingFactory.eINSTANCE.createHistoryState()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.PARALLEL__ANCHOR,
-				 ScxmlFactory.eINSTANCE.createAnchor()));
+				(ModelingPackage.Literals.PARALLEL__ANCHOR,
+				 ModelingFactory.eINSTANCE.createAnchor()));
 	}
 
 	/**
@@ -236,8 +223,8 @@ public class ParallelItemProvider
 		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/ParamItemProvider.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/ParamItemProvider.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/ParamItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ParamItemProvider.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,8 +10,8 @@ package org.apache.commons.scxml.modelin
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.Param;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -91,7 +78,7 @@ public class ParamItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Param_name_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Param_name_feature", "_UI_Param_type"),
-				 ScxmlPackage.Literals.PARAM__NAME,
+				 ModelingPackage.Literals.PARAM__NAME,
 				 true,
 				 false,
 				 false,
@@ -113,7 +100,7 @@ public class ParamItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Param_expr_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Param_expr_feature", "_UI_Param_type"),
-				 ScxmlPackage.Literals.PARAM__EXPR,
+				 ModelingPackage.Literals.PARAM__EXPR,
 				 true,
 				 false,
 				 false,
@@ -156,8 +143,8 @@ public class ParamItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Param.class)) {
-			case ScxmlPackage.PARAM__NAME:
-			case ScxmlPackage.PARAM__EXPR:
+			case ModelingPackage.PARAM__NAME:
+			case ModelingPackage.PARAM__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/RaiseItemProvider.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/RaiseItemProvider.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/RaiseItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/RaiseItemProvider.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,8 +10,8 @@ package org.apache.commons.scxml.modelin
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.commons.scxml.modeling.ModelingPackage;
 import org.apache.commons.scxml.modeling.Raise;
-import org.apache.commons.scxml.modeling.ScxmlPackage;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -90,7 +77,7 @@ public class RaiseItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Raise_event_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Raise_event_feature", "_UI_Raise_type"),
-				 ScxmlPackage.Literals.RAISE__EVENT,
+				 ModelingPackage.Literals.RAISE__EVENT,
 				 true,
 				 false,
 				 false,
@@ -133,7 +120,7 @@ public class RaiseItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Raise.class)) {
-			case ScxmlPackage.RAISE__EVENT:
+			case ModelingPackage.RAISE__EVENT:
 				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/ScriptItemProvider.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/ScriptItemProvider.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/ScriptItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ScriptItemProvider.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 ScriptItemProvider
 	 * @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/SendItemProvider.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/SendItemProvider.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/SendItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/SendItemProvider.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,8 +10,8 @@ package org.apache.commons.scxml.modelin
 import java.util.Collection;
 import java.util.List;
 
-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.apache.commons.scxml.modeling.Send;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -105,7 +92,7 @@ public class SendItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Send_event_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Send_event_feature", "_UI_Send_type"),
-				 ScxmlPackage.Literals.SEND__EVENT,
+				 ModelingPackage.Literals.SEND__EVENT,
 				 true,
 				 false,
 				 false,
@@ -127,7 +114,7 @@ public class SendItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Send_eventexpr_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Send_eventexpr_feature", "_UI_Send_type"),
-				 ScxmlPackage.Literals.SEND__EVENTEXPR,
+				 ModelingPackage.Literals.SEND__EVENTEXPR,
 				 true,
 				 false,
 				 false,
@@ -149,7 +136,7 @@ public class SendItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Send_target_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Send_target_feature", "_UI_Send_type"),
-				 ScxmlPackage.Literals.SEND__TARGET,
+				 ModelingPackage.Literals.SEND__TARGET,
 				 true,
 				 false,
 				 false,
@@ -171,7 +158,7 @@ public class SendItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Send_targetexpr_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Send_targetexpr_feature", "_UI_Send_type"),
-				 ScxmlPackage.Literals.SEND__TARGETEXPR,
+				 ModelingPackage.Literals.SEND__TARGETEXPR,
 				 true,
 				 false,
 				 false,
@@ -193,7 +180,7 @@ public class SendItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Send_type_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Send_type_feature", "_UI_Send_type"),
-				 ScxmlPackage.Literals.SEND__TYPE,
+				 ModelingPackage.Literals.SEND__TYPE,
 				 true,
 				 false,
 				 false,
@@ -215,7 +202,7 @@ public class SendItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Send_typeexpr_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Send_typeexpr_feature", "_UI_Send_type"),
-				 ScxmlPackage.Literals.SEND__TYPEEXPR,
+				 ModelingPackage.Literals.SEND__TYPEEXPR,
 				 true,
 				 false,
 				 false,
@@ -237,7 +224,7 @@ public class SendItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Send_id_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Send_id_feature", "_UI_Send_type"),
-				 ScxmlPackage.Literals.SEND__ID,
+				 ModelingPackage.Literals.SEND__ID,
 				 true,
 				 false,
 				 false,
@@ -259,7 +246,7 @@ public class SendItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Send_idlocation_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Send_idlocation_feature", "_UI_Send_type"),
-				 ScxmlPackage.Literals.SEND__IDLOCATION,
+				 ModelingPackage.Literals.SEND__IDLOCATION,
 				 true,
 				 false,
 				 false,
@@ -281,7 +268,7 @@ public class SendItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Send_delay_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Send_delay_feature", "_UI_Send_type"),
-				 ScxmlPackage.Literals.SEND__DELAY,
+				 ModelingPackage.Literals.SEND__DELAY,
 				 true,
 				 false,
 				 false,
@@ -303,7 +290,7 @@ public class SendItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Send_delayexpr_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Send_delayexpr_feature", "_UI_Send_type"),
-				 ScxmlPackage.Literals.SEND__DELAYEXPR,
+				 ModelingPackage.Literals.SEND__DELAYEXPR,
 				 true,
 				 false,
 				 false,
@@ -325,7 +312,7 @@ public class SendItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Send_namelist_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Send_namelist_feature", "_UI_Send_type"),
-				 ScxmlPackage.Literals.SEND__NAMELIST,
+				 ModelingPackage.Literals.SEND__NAMELIST,
 				 true,
 				 false,
 				 false,
@@ -347,7 +334,7 @@ public class SendItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Send_hints_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Send_hints_feature", "_UI_Send_type"),
-				 ScxmlPackage.Literals.SEND__HINTS,
+				 ModelingPackage.Literals.SEND__HINTS,
 				 true,
 				 false,
 				 false,
@@ -369,7 +356,7 @@ public class SendItemProvider
 				 getResourceLocator(),
 				 getString("_UI_Send_hintsexpr_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_Send_hintsexpr_feature", "_UI_Send_type"),
-				 ScxmlPackage.Literals.SEND__HINTSEXPR,
+				 ModelingPackage.Literals.SEND__HINTSEXPR,
 				 true,
 				 false,
 				 false,
@@ -389,8 +376,8 @@ public class SendItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.SEND__PARAM);
-			childrenFeatures.add(ScxmlPackage.Literals.SEND__CONTENT);
+			childrenFeatures.add(ModelingPackage.Literals.SEND__PARAM);
+			childrenFeatures.add(ModelingPackage.Literals.SEND__CONTENT);
 		}
 		return childrenFeatures;
 	}
@@ -441,23 +428,23 @@ public class SendItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Send.class)) {
-			case ScxmlPackage.SEND__EVENT:
-			case ScxmlPackage.SEND__EVENTEXPR:
-			case ScxmlPackage.SEND__TARGET:
-			case ScxmlPackage.SEND__TARGETEXPR:
-			case ScxmlPackage.SEND__TYPE:
-			case ScxmlPackage.SEND__TYPEEXPR:
-			case ScxmlPackage.SEND__ID:
-			case ScxmlPackage.SEND__IDLOCATION:
-			case ScxmlPackage.SEND__DELAY:
-			case ScxmlPackage.SEND__DELAYEXPR:
-			case ScxmlPackage.SEND__NAMELIST:
-			case ScxmlPackage.SEND__HINTS:
-			case ScxmlPackage.SEND__HINTSEXPR:
+			case ModelingPackage.SEND__EVENT:
+			case ModelingPackage.SEND__EVENTEXPR:
+			case ModelingPackage.SEND__TARGET:
+			case ModelingPackage.SEND__TARGETEXPR:
+			case ModelingPackage.SEND__TYPE:
+			case ModelingPackage.SEND__TYPEEXPR:
+			case ModelingPackage.SEND__ID:
+			case ModelingPackage.SEND__IDLOCATION:
+			case ModelingPackage.SEND__DELAY:
+			case ModelingPackage.SEND__DELAYEXPR:
+			case ModelingPackage.SEND__NAMELIST:
+			case ModelingPackage.SEND__HINTS:
+			case ModelingPackage.SEND__HINTSEXPR:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ScxmlPackage.SEND__PARAM:
-			case ScxmlPackage.SEND__CONTENT:
+			case ModelingPackage.SEND__PARAM:
+			case ModelingPackage.SEND__CONTENT:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -476,13 +463,13 @@ public class SendItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.SEND__PARAM,
-				 ScxmlFactory.eINSTANCE.createParam()));
+				(ModelingPackage.Literals.SEND__PARAM,
+				 ModelingFactory.eINSTANCE.createParam()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.SEND__CONTENT,
-				 ScxmlFactory.eINSTANCE.createContent()));
+				(ModelingPackage.Literals.SEND__CONTENT,
+				 ModelingFactory.eINSTANCE.createContent()));
 	}
 
 }

Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ServiceTemplateItemProvider.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/ServiceTemplateItemProvider.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/ServiceTemplateItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/ServiceTemplateItemProvider.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,8 +10,8 @@ package org.apache.commons.scxml.modelin
 import java.util.Collection;
 import java.util.List;
 
-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.apache.commons.scxml.modeling.ServiceTemplate;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -101,7 +88,7 @@ public class ServiceTemplateItemProvider
 				 getResourceLocator(),
 				 getString("_UI_ServiceTemplate_initial_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_ServiceTemplate_initial_feature", "_UI_ServiceTemplate_type"),
-				 ScxmlPackage.Literals.SERVICE_TEMPLATE__INITIAL,
+				 ModelingPackage.Literals.SERVICE_TEMPLATE__INITIAL,
 				 true,
 				 false,
 				 false,
@@ -123,7 +110,7 @@ public class ServiceTemplateItemProvider
 				 getResourceLocator(),
 				 getString("_UI_ServiceTemplate_name_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_ServiceTemplate_name_feature", "_UI_ServiceTemplate_type"),
-				 ScxmlPackage.Literals.SERVICE_TEMPLATE__NAME,
+				 ModelingPackage.Literals.SERVICE_TEMPLATE__NAME,
 				 true,
 				 false,
 				 false,
@@ -145,7 +132,7 @@ public class ServiceTemplateItemProvider
 				 getResourceLocator(),
 				 getString("_UI_ServiceTemplate_xmlns_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_ServiceTemplate_xmlns_feature", "_UI_ServiceTemplate_type"),
-				 ScxmlPackage.Literals.SERVICE_TEMPLATE__XMLNS,
+				 ModelingPackage.Literals.SERVICE_TEMPLATE__XMLNS,
 				 true,
 				 false,
 				 false,
@@ -167,7 +154,7 @@ public class ServiceTemplateItemProvider
 				 getResourceLocator(),
 				 getString("_UI_ServiceTemplate_version_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_ServiceTemplate_version_feature", "_UI_ServiceTemplate_type"),
-				 ScxmlPackage.Literals.SERVICE_TEMPLATE__VERSION,
+				 ModelingPackage.Literals.SERVICE_TEMPLATE__VERSION,
 				 true,
 				 false,
 				 false,
@@ -189,7 +176,7 @@ public class ServiceTemplateItemProvider
 				 getResourceLocator(),
 				 getString("_UI_ServiceTemplate_profile_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_ServiceTemplate_profile_feature", "_UI_ServiceTemplate_type"),
-				 ScxmlPackage.Literals.SERVICE_TEMPLATE__PROFILE,
+				 ModelingPackage.Literals.SERVICE_TEMPLATE__PROFILE,
 				 true,
 				 false,
 				 false,
@@ -211,7 +198,7 @@ public class ServiceTemplateItemProvider
 				 getResourceLocator(),
 				 getString("_UI_ServiceTemplate_exmode_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_ServiceTemplate_exmode_feature", "_UI_ServiceTemplate_type"),
-				 ScxmlPackage.Literals.SERVICE_TEMPLATE__EXMODE,
+				 ModelingPackage.Literals.SERVICE_TEMPLATE__EXMODE,
 				 true,
 				 false,
 				 false,
@@ -231,13 +218,13 @@ public class ServiceTemplateItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.SERVICE_TEMPLATE__TRANS_LIST);
-			childrenFeatures.add(ScxmlPackage.Literals.SERVICE_TEMPLATE__STATE_LIST);
-			childrenFeatures.add(ScxmlPackage.Literals.SERVICE_TEMPLATE__INITIAL_STATE);
-			childrenFeatures.add(ScxmlPackage.Literals.SERVICE_TEMPLATE__FINAL_STATE);
-			childrenFeatures.add(ScxmlPackage.Literals.SERVICE_TEMPLATE__PARALLEL);
-			childrenFeatures.add(ScxmlPackage.Literals.SERVICE_TEMPLATE__DATA_MODEL);
-			childrenFeatures.add(ScxmlPackage.Literals.SERVICE_TEMPLATE__SCRIPT);
+			childrenFeatures.add(ModelingPackage.Literals.SERVICE_TEMPLATE__TRANS_LIST);
+			childrenFeatures.add(ModelingPackage.Literals.SERVICE_TEMPLATE__STATE_LIST);
+			childrenFeatures.add(ModelingPackage.Literals.SERVICE_TEMPLATE__INITIAL_STATE);
+			childrenFeatures.add(ModelingPackage.Literals.SERVICE_TEMPLATE__FINAL_STATE);
+			childrenFeatures.add(ModelingPackage.Literals.SERVICE_TEMPLATE__PARALLEL);
+			childrenFeatures.add(ModelingPackage.Literals.SERVICE_TEMPLATE__DATA_MODEL);
+			childrenFeatures.add(ModelingPackage.Literals.SERVICE_TEMPLATE__SCRIPT);
 		}
 		return childrenFeatures;
 	}
@@ -288,21 +275,21 @@ public class ServiceTemplateItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(ServiceTemplate.class)) {
-			case ScxmlPackage.SERVICE_TEMPLATE__INITIAL:
-			case ScxmlPackage.SERVICE_TEMPLATE__NAME:
-			case ScxmlPackage.SERVICE_TEMPLATE__XMLNS:
-			case ScxmlPackage.SERVICE_TEMPLATE__VERSION:
-			case ScxmlPackage.SERVICE_TEMPLATE__PROFILE:
-			case ScxmlPackage.SERVICE_TEMPLATE__EXMODE:
+			case ModelingPackage.SERVICE_TEMPLATE__INITIAL:
+			case ModelingPackage.SERVICE_TEMPLATE__NAME:
+			case ModelingPackage.SERVICE_TEMPLATE__XMLNS:
+			case ModelingPackage.SERVICE_TEMPLATE__VERSION:
+			case ModelingPackage.SERVICE_TEMPLATE__PROFILE:
+			case ModelingPackage.SERVICE_TEMPLATE__EXMODE:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ScxmlPackage.SERVICE_TEMPLATE__TRANS_LIST:
-			case ScxmlPackage.SERVICE_TEMPLATE__STATE_LIST:
-			case ScxmlPackage.SERVICE_TEMPLATE__INITIAL_STATE:
-			case ScxmlPackage.SERVICE_TEMPLATE__FINAL_STATE:
-			case ScxmlPackage.SERVICE_TEMPLATE__PARALLEL:
-			case ScxmlPackage.SERVICE_TEMPLATE__DATA_MODEL:
-			case ScxmlPackage.SERVICE_TEMPLATE__SCRIPT:
+			case ModelingPackage.SERVICE_TEMPLATE__TRANS_LIST:
+			case ModelingPackage.SERVICE_TEMPLATE__STATE_LIST:
+			case ModelingPackage.SERVICE_TEMPLATE__INITIAL_STATE:
+			case ModelingPackage.SERVICE_TEMPLATE__FINAL_STATE:
+			case ModelingPackage.SERVICE_TEMPLATE__PARALLEL:
+			case ModelingPackage.SERVICE_TEMPLATE__DATA_MODEL:
+			case ModelingPackage.SERVICE_TEMPLATE__SCRIPT:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -321,38 +308,38 @@ public class ServiceTemplateItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.SERVICE_TEMPLATE__TRANS_LIST,
-				 ScxmlFactory.eINSTANCE.createTranslation()));
+				(ModelingPackage.Literals.SERVICE_TEMPLATE__TRANS_LIST,
+				 ModelingFactory.eINSTANCE.createTranslation()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.SERVICE_TEMPLATE__STATE_LIST,
-				 ScxmlFactory.eINSTANCE.createState()));
+				(ModelingPackage.Literals.SERVICE_TEMPLATE__STATE_LIST,
+				 ModelingFactory.eINSTANCE.createState()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.SERVICE_TEMPLATE__INITIAL_STATE,
-				 ScxmlFactory.eINSTANCE.createInitialState()));
+				(ModelingPackage.Literals.SERVICE_TEMPLATE__INITIAL_STATE,
+				 ModelingFactory.eINSTANCE.createInitialState()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.SERVICE_TEMPLATE__FINAL_STATE,
-				 ScxmlFactory.eINSTANCE.createFinalState()));
+				(ModelingPackage.Literals.SERVICE_TEMPLATE__FINAL_STATE,
+				 ModelingFactory.eINSTANCE.createFinalState()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.SERVICE_TEMPLATE__PARALLEL,
-				 ScxmlFactory.eINSTANCE.createParallel()));
+				(ModelingPackage.Literals.SERVICE_TEMPLATE__PARALLEL,
+				 ModelingFactory.eINSTANCE.createParallel()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.SERVICE_TEMPLATE__DATA_MODEL,
-				 ScxmlFactory.eINSTANCE.createDataModel()));
+				(ModelingPackage.Literals.SERVICE_TEMPLATE__DATA_MODEL,
+				 ModelingFactory.eINSTANCE.createDataModel()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.SERVICE_TEMPLATE__SCRIPT,
-				 ScxmlFactory.eINSTANCE.createScript()));
+				(ModelingPackage.Literals.SERVICE_TEMPLATE__SCRIPT,
+				 ModelingFactory.eINSTANCE.createScript()));
 	}
 
 	/**
@@ -362,7 +349,7 @@ public class ServiceTemplateItemProvider
 	 * @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/StateItemProvider.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/StateItemProvider.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/StateItemProvider.java (original)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.edit/src/org/apache/commons/scxml/modeling/provider/StateItemProvider.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,8 +10,8 @@ package org.apache.commons.scxml.modelin
 import java.util.Collection;
 import java.util.List;
 
-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.apache.commons.scxml.modeling.State;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
@@ -94,7 +81,7 @@ public class StateItemProvider
 				 getResourceLocator(),
 				 getString("_UI_State_id_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_State_id_feature", "_UI_State_type"),
-				 ScxmlPackage.Literals.STATE__ID,
+				 ModelingPackage.Literals.STATE__ID,
 				 true,
 				 false,
 				 false,
@@ -116,7 +103,7 @@ public class StateItemProvider
 				 getResourceLocator(),
 				 getString("_UI_State_initial_feature"),
 				 getString("_UI_PropertyDescriptor_description", "_UI_State_initial_feature", "_UI_State_type"),
-				 ScxmlPackage.Literals.STATE__INITIAL,
+				 ModelingPackage.Literals.STATE__INITIAL,
 				 true,
 				 false,
 				 false,
@@ -136,15 +123,15 @@ public class StateItemProvider
 	public Collection getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(ScxmlPackage.Literals.STATE__ON_ENTRY);
-			childrenFeatures.add(ScxmlPackage.Literals.STATE__ON_EXIT);
-			childrenFeatures.add(ScxmlPackage.Literals.STATE__INIT_STATE);
-			childrenFeatures.add(ScxmlPackage.Literals.STATE__SUB_STATE);
-			childrenFeatures.add(ScxmlPackage.Literals.STATE__FINAL_STATE);
-			childrenFeatures.add(ScxmlPackage.Literals.STATE__SUB_PARALLEL);
-			childrenFeatures.add(ScxmlPackage.Literals.STATE__HISTORY_STATE);
-			childrenFeatures.add(ScxmlPackage.Literals.STATE__ANCHOR);
-			childrenFeatures.add(ScxmlPackage.Literals.STATE__INVOKE);
+			childrenFeatures.add(ModelingPackage.Literals.STATE__ON_ENTRY);
+			childrenFeatures.add(ModelingPackage.Literals.STATE__ON_EXIT);
+			childrenFeatures.add(ModelingPackage.Literals.STATE__INIT_STATE);
+			childrenFeatures.add(ModelingPackage.Literals.STATE__SUB_STATE);
+			childrenFeatures.add(ModelingPackage.Literals.STATE__FINAL_STATE);
+			childrenFeatures.add(ModelingPackage.Literals.STATE__SUB_PARALLEL);
+			childrenFeatures.add(ModelingPackage.Literals.STATE__HISTORY_STATE);
+			childrenFeatures.add(ModelingPackage.Literals.STATE__ANCHOR);
+			childrenFeatures.add(ModelingPackage.Literals.STATE__INVOKE);
 		}
 		return childrenFeatures;
 	}
@@ -195,19 +182,19 @@ public class StateItemProvider
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(State.class)) {
-			case ScxmlPackage.STATE__ID:
-			case ScxmlPackage.STATE__INITIAL:
+			case ModelingPackage.STATE__ID:
+			case ModelingPackage.STATE__INITIAL:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
-			case ScxmlPackage.STATE__ON_ENTRY:
-			case ScxmlPackage.STATE__ON_EXIT:
-			case ScxmlPackage.STATE__INIT_STATE:
-			case ScxmlPackage.STATE__SUB_STATE:
-			case ScxmlPackage.STATE__FINAL_STATE:
-			case ScxmlPackage.STATE__SUB_PARALLEL:
-			case ScxmlPackage.STATE__HISTORY_STATE:
-			case ScxmlPackage.STATE__ANCHOR:
-			case ScxmlPackage.STATE__INVOKE:
+			case ModelingPackage.STATE__ON_ENTRY:
+			case ModelingPackage.STATE__ON_EXIT:
+			case ModelingPackage.STATE__INIT_STATE:
+			case ModelingPackage.STATE__SUB_STATE:
+			case ModelingPackage.STATE__FINAL_STATE:
+			case ModelingPackage.STATE__SUB_PARALLEL:
+			case ModelingPackage.STATE__HISTORY_STATE:
+			case ModelingPackage.STATE__ANCHOR:
+			case ModelingPackage.STATE__INVOKE:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 		}
@@ -226,48 +213,48 @@ public class StateItemProvider
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.STATE__ON_ENTRY,
-				 ScxmlFactory.eINSTANCE.createOnEntry()));
+				(ModelingPackage.Literals.STATE__ON_ENTRY,
+				 ModelingFactory.eINSTANCE.createOnEntry()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.STATE__ON_EXIT,
-				 ScxmlFactory.eINSTANCE.createOnExit()));
+				(ModelingPackage.Literals.STATE__ON_EXIT,
+				 ModelingFactory.eINSTANCE.createOnExit()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.STATE__INIT_STATE,
-				 ScxmlFactory.eINSTANCE.createInitialState()));
+				(ModelingPackage.Literals.STATE__INIT_STATE,
+				 ModelingFactory.eINSTANCE.createInitialState()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.STATE__SUB_STATE,
-				 ScxmlFactory.eINSTANCE.createState()));
+				(ModelingPackage.Literals.STATE__SUB_STATE,
+				 ModelingFactory.eINSTANCE.createState()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.STATE__FINAL_STATE,
-				 ScxmlFactory.eINSTANCE.createFinalState()));
+				(ModelingPackage.Literals.STATE__FINAL_STATE,
+				 ModelingFactory.eINSTANCE.createFinalState()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.STATE__SUB_PARALLEL,
-				 ScxmlFactory.eINSTANCE.createParallel()));
+				(ModelingPackage.Literals.STATE__SUB_PARALLEL,
+				 ModelingFactory.eINSTANCE.createParallel()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.STATE__HISTORY_STATE,
-				 ScxmlFactory.eINSTANCE.createHistoryState()));
+				(ModelingPackage.Literals.STATE__HISTORY_STATE,
+				 ModelingFactory.eINSTANCE.createHistoryState()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.STATE__ANCHOR,
-				 ScxmlFactory.eINSTANCE.createAnchor()));
+				(ModelingPackage.Literals.STATE__ANCHOR,
+				 ModelingFactory.eINSTANCE.createAnchor()));
 
 		newChildDescriptors.add
 			(createChildParameter
-				(ScxmlPackage.Literals.STATE__INVOKE,
-				 ScxmlFactory.eINSTANCE.createInvoke()));
+				(ModelingPackage.Literals.STATE__INVOKE,
+				 ModelingFactory.eINSTANCE.createInvoke()));
 	}
 
 	/**
@@ -281,8 +268,8 @@ public class StateItemProvider
 		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