Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF12
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.xml4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel10
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/Folder.java40
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java7
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuRegistry.java5
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/CreationMenu.java (renamed from plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/CreationMenu.java)32
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/ElementCreationMenuModelFactory.java (renamed from plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/ElementCreationMenuModelFactory.java)16
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/ElementCreationMenuModelPackage.java (renamed from plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/ElementCreationMenuModelPackage.java)88
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/Folder.java50
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/Menu.java (renamed from plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/Menu.java)26
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/CreationMenuImpl.java (renamed from plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/CreationMenuImpl.java)24
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/ElementCreationMenuModelFactoryImpl.java (renamed from plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/ElementCreationMenuModelFactoryImpl.java)15
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/ElementCreationMenuModelPackageImpl.java (renamed from plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/ElementCreationMenuModelPackageImpl.java)26
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/FolderImpl.java (renamed from plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/FolderImpl.java)22
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/MenuImpl.java (renamed from plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/MenuImpl.java)22
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelAdapterFactory.java (renamed from plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelAdapterFactory.java)30
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelResourceFactoryImpl.java (renamed from plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelResourceFactoryImpl.java)14
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelResourceImpl.java (renamed from plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelResourceImpl.java)14
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelSwitch.java (renamed from plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelSwitch.java)17
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelXMLProcessor.java (renamed from plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelXMLProcessor.java)16
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF8
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/DynamicNewChild.java18
-rw-r--r--tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF6
24 files changed, 330 insertions, 192 deletions
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
index d260bcc31ba..37cabf42721 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.papyrus.infra.newchild.Activator
Require-Bundle: org.eclipse.ui,
@@ -18,11 +18,11 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.gmf.runtime.emf.type.core,
org.eclipse.papyrus.infra.services.edit,
org.eclipse.papyrus.infra.gmfdiag.commands
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: ElementCreationMenuModel,
- ElementCreationMenuModel.impl,
- ElementCreationMenuModel.util,
- org.eclipse.papyrus.infra.newchild
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.papyrus.infra.newchild,
+ org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel,
+ org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl,
+ org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.xml
index 390a9b37228..b23f29f88bf 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.xml
@@ -7,7 +7,7 @@
<!-- @generated elementCreationMenuModel -->
<package
uri="http://ElementCreationMenuModel"
- class="ElementCreationMenuModel.ElementCreationMenuModelPackage"
+ class="org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage"
genModel="resource/elementCreationMenuModel.genmodel"/>
</extension>
@@ -15,6 +15,6 @@
<!-- @generated elementCreationMenuModel -->
<parser
type="elementcreationmenumodel"
- class="ElementCreationMenuModel.util.ElementCreationMenuModelResourceFactoryImpl"/>
+ class="org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util.ElementCreationMenuModelResourceFactoryImpl"/>
</extension>
</plugin>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel
index cd8da9bdfee..95e33c24450 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.infra.newchild/src" modelPluginID="org.eclipse.papyrus.infra.newchild"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA; &#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA;Contributors:&#xD;&#xA;&#x9;CEA LIST - Initial API and implementation&#xD;&#xA;"
+ modelDirectory="/org.eclipse.papyrus.infra.newchild/src" modelPluginID="org.eclipse.papyrus.infra.newchild"
modelName="ElementCreationMenuModel" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore" operationReflection="true"
importOrganizing="true">
<foreignModel>elementCreationMenuModel.ecore</foreignModel>
- <genPackages prefix="ElementCreationMenuModel" resource="XML" disposableProviderFactory="true"
- ecorePackage="elementCreationMenuModel.ecore#/">
+ <genPackages prefix="ElementCreationMenuModel" basePackage="org.eclipse.papyrus.infra.newchild"
+ resource="XML" disposableProviderFactory="true" ecorePackage="elementCreationMenuModel.ecore#/">
<genClasses ecoreClass="elementCreationMenuModel.ecore#//Folder">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference elementCreationMenuModel.ecore#//Folder/menu"/>
</genClasses>
@@ -17,7 +18,8 @@
</genClasses>
<genClasses ecoreClass="elementCreationMenuModel.ecore#//CreationMenu">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//CreationMenu/elementTypeIdRef"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//CreationMenu/Role"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//CreationMenu/role"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//CreationMenu/displayAllRoles"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/Folder.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/Folder.java
deleted file mode 100644
index b47cabe596a..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/Folder.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- */
-package ElementCreationMenuModel;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Folder</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link ElementCreationMenuModel.Folder#getMenu <em>Menu</em>}</li>
- * </ul>
- * </p>
- *
- * @see ElementCreationMenuModel.ElementCreationMenuModelPackage#getFolder()
- * @model
- * @generated
- */
-public interface Folder extends Menu {
- /**
- * Returns the value of the '<em><b>Menu</b></em>' containment reference list.
- * The list contents are of type {@link ElementCreationMenuModel.Menu}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Menu</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Menu</em>' containment reference list.
- * @see ElementCreationMenuModel.ElementCreationMenuModelPackage#getFolder_Menu()
- * @model containment="true"
- * @generated
- */
- EList<Menu> getMenu();
-
-} // Folder
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
index 79398b31f8e..d899f0c8838 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
@@ -32,15 +32,14 @@ import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder;
import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
-import ElementCreationMenuModel.CreationMenu;
-import ElementCreationMenuModel.Folder;
-
/**
* this class contains code to construct menu from a Menu and a selected object
*
@@ -83,7 +82,7 @@ public class CreationMenuFactory {
Menu topMenu=new Menu(menu);
topMenuItem.setMenu(topMenu);
boolean oneDisplayedMenu=false;
- for(ElementCreationMenuModel.Menu currentMenu : folder.getMenu()) {
+ for(org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu currentMenu : folder.getMenu()) {
if( currentMenu instanceof Folder){
boolean subMenu=populateMenu(topMenu, (Folder) currentMenu, selectedObject);
if(subMenu){
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuRegistry.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuRegistry.java
index d6eb11b43dd..8e1fe3802dc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuRegistry.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuRegistry.java
@@ -23,10 +23,9 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder;
import org.osgi.framework.Bundle;
-
-import ElementCreationMenuModel.ElementCreationMenuModelPackage;
-import ElementCreationMenuModel.Folder;
/**
* This class is used to load all extension point call org.eclipse.papyrus.infra.newchild
* It gives the set of all Folder that has to be displayed
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/CreationMenu.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/CreationMenu.java
index e1b780ea4cd..8ef1807833d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/CreationMenu.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/CreationMenu.java
@@ -1,6 +1,16 @@
/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
-package ElementCreationMenuModel;
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel;
/**
@@ -11,13 +21,13 @@ package ElementCreationMenuModel;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link ElementCreationMenuModel.CreationMenu#getElementTypeIdRef <em>Element Type Id Ref</em>}</li>
- * <li>{@link ElementCreationMenuModel.CreationMenu#getRole <em>Role</em>}</li>
- * <li>{@link ElementCreationMenuModel.CreationMenu#isDisplayAllRoles <em>Display All Roles</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getElementTypeIdRef <em>Element Type Id Ref</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getRole <em>Role</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#isDisplayAllRoles <em>Display All Roles</em>}</li>
* </ul>
* </p>
*
- * @see ElementCreationMenuModel.ElementCreationMenuModelPackage#getCreationMenu()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getCreationMenu()
* @model
* @generated
*/
@@ -32,14 +42,14 @@ public interface CreationMenu extends Menu {
* <!-- end-user-doc -->
* @return the value of the '<em>Element Type Id Ref</em>' attribute.
* @see #setElementTypeIdRef(String)
- * @see ElementCreationMenuModel.ElementCreationMenuModelPackage#getCreationMenu_ElementTypeIdRef()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getCreationMenu_ElementTypeIdRef()
* @model required="true" ordered="false"
* @generated
*/
String getElementTypeIdRef();
/**
- * Sets the value of the '{@link ElementCreationMenuModel.CreationMenu#getElementTypeIdRef <em>Element Type Id Ref</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getElementTypeIdRef <em>Element Type Id Ref</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Element Type Id Ref</em>' attribute.
@@ -58,14 +68,14 @@ public interface CreationMenu extends Menu {
* <!-- end-user-doc -->
* @return the value of the '<em>Role</em>' attribute.
* @see #setRole(String)
- * @see ElementCreationMenuModel.ElementCreationMenuModelPackage#getCreationMenu_Role()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getCreationMenu_Role()
* @model ordered="false"
* @generated
*/
String getRole();
/**
- * Sets the value of the '{@link ElementCreationMenuModel.CreationMenu#getRole <em>Role</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getRole <em>Role</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Role</em>' attribute.
@@ -85,14 +95,14 @@ public interface CreationMenu extends Menu {
* <!-- end-user-doc -->
* @return the value of the '<em>Display All Roles</em>' attribute.
* @see #setDisplayAllRoles(boolean)
- * @see ElementCreationMenuModel.ElementCreationMenuModelPackage#getCreationMenu_DisplayAllRoles()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getCreationMenu_DisplayAllRoles()
* @model default="true" required="true" ordered="false"
* @generated
*/
boolean isDisplayAllRoles();
/**
- * Sets the value of the '{@link ElementCreationMenuModel.CreationMenu#isDisplayAllRoles <em>Display All Roles</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#isDisplayAllRoles <em>Display All Roles</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Display All Roles</em>' attribute.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/ElementCreationMenuModelFactory.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/ElementCreationMenuModelFactory.java
index eb8020a2f09..7f3aa48cd40 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/ElementCreationMenuModelFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/ElementCreationMenuModelFactory.java
@@ -1,6 +1,16 @@
/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
-package ElementCreationMenuModel;
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel;
import org.eclipse.emf.ecore.EFactory;
@@ -9,7 +19,7 @@ import org.eclipse.emf.ecore.EFactory;
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
* <!-- end-user-doc -->
- * @see ElementCreationMenuModel.ElementCreationMenuModelPackage
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage
* @generated
*/
public interface ElementCreationMenuModelFactory extends EFactory {
@@ -19,7 +29,7 @@ public interface ElementCreationMenuModelFactory extends EFactory {
* <!-- end-user-doc -->
* @generated
*/
- ElementCreationMenuModelFactory eINSTANCE = ElementCreationMenuModel.impl.ElementCreationMenuModelFactoryImpl.init();
+ ElementCreationMenuModelFactory eINSTANCE = org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelFactoryImpl.init();
/**
* Returns a new object of class '<em>Folder</em>'.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/ElementCreationMenuModelPackage.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/ElementCreationMenuModelPackage.java
index acf3e943e89..a6055983799 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/ElementCreationMenuModelPackage.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/ElementCreationMenuModelPackage.java
@@ -1,6 +1,16 @@
/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
-package ElementCreationMenuModel;
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -19,7 +29,7 @@ import org.eclipse.emf.ecore.EReference;
* <li>and each data type</li>
* </ul>
* <!-- end-user-doc -->
- * @see ElementCreationMenuModel.ElementCreationMenuModelFactory
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelFactory
* @model kind="package"
* @generated
*/
@@ -54,14 +64,14 @@ public interface ElementCreationMenuModelPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- ElementCreationMenuModelPackage eINSTANCE = ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl.init();
+ ElementCreationMenuModelPackage eINSTANCE = org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl.init();
/**
- * The meta object id for the '{@link ElementCreationMenuModel.impl.MenuImpl <em>Menu</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.MenuImpl <em>Menu</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see ElementCreationMenuModel.impl.MenuImpl
- * @see ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getMenu()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.MenuImpl
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getMenu()
* @generated
*/
int MENU = 1;
@@ -103,11 +113,11 @@ public interface ElementCreationMenuModelPackage extends EPackage {
int MENU_OPERATION_COUNT = 0;
/**
- * The meta object id for the '{@link ElementCreationMenuModel.impl.FolderImpl <em>Folder</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.FolderImpl <em>Folder</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see ElementCreationMenuModel.impl.FolderImpl
- * @see ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getFolder()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.FolderImpl
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getFolder()
* @generated
*/
int FOLDER = 0;
@@ -158,11 +168,11 @@ public interface ElementCreationMenuModelPackage extends EPackage {
int FOLDER_OPERATION_COUNT = MENU_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link ElementCreationMenuModel.impl.CreationMenuImpl <em>Creation Menu</em>}' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.CreationMenuImpl <em>Creation Menu</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see ElementCreationMenuModel.impl.CreationMenuImpl
- * @see ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getCreationMenu()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.CreationMenuImpl
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getCreationMenu()
* @generated
*/
int CREATION_MENU = 2;
@@ -232,96 +242,96 @@ public interface ElementCreationMenuModelPackage extends EPackage {
/**
- * Returns the meta object for class '{@link ElementCreationMenuModel.Folder <em>Folder</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder <em>Folder</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Folder</em>'.
- * @see ElementCreationMenuModel.Folder
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder
* @generated
*/
EClass getFolder();
/**
- * Returns the meta object for the containment reference list '{@link ElementCreationMenuModel.Folder#getMenu <em>Menu</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder#getMenu <em>Menu</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Menu</em>'.
- * @see ElementCreationMenuModel.Folder#getMenu()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder#getMenu()
* @see #getFolder()
* @generated
*/
EReference getFolder_Menu();
/**
- * Returns the meta object for class '{@link ElementCreationMenuModel.Menu <em>Menu</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu <em>Menu</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Menu</em>'.
- * @see ElementCreationMenuModel.Menu
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu
* @generated
*/
EClass getMenu();
/**
- * Returns the meta object for the attribute '{@link ElementCreationMenuModel.Menu#getLabel <em>Label</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getLabel <em>Label</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Label</em>'.
- * @see ElementCreationMenuModel.Menu#getLabel()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getLabel()
* @see #getMenu()
* @generated
*/
EAttribute getMenu_Label();
/**
- * Returns the meta object for the attribute '{@link ElementCreationMenuModel.Menu#getIcon <em>Icon</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getIcon <em>Icon</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Icon</em>'.
- * @see ElementCreationMenuModel.Menu#getIcon()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getIcon()
* @see #getMenu()
* @generated
*/
EAttribute getMenu_Icon();
/**
- * Returns the meta object for class '{@link ElementCreationMenuModel.CreationMenu <em>Creation Menu</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu <em>Creation Menu</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Creation Menu</em>'.
- * @see ElementCreationMenuModel.CreationMenu
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu
* @generated
*/
EClass getCreationMenu();
/**
- * Returns the meta object for the attribute '{@link ElementCreationMenuModel.CreationMenu#getElementTypeIdRef <em>Element Type Id Ref</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getElementTypeIdRef <em>Element Type Id Ref</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Element Type Id Ref</em>'.
- * @see ElementCreationMenuModel.CreationMenu#getElementTypeIdRef()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getElementTypeIdRef()
* @see #getCreationMenu()
* @generated
*/
EAttribute getCreationMenu_ElementTypeIdRef();
/**
- * Returns the meta object for the attribute '{@link ElementCreationMenuModel.CreationMenu#getRole <em>Role</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getRole <em>Role</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Role</em>'.
- * @see ElementCreationMenuModel.CreationMenu#getRole()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getRole()
* @see #getCreationMenu()
* @generated
*/
EAttribute getCreationMenu_Role();
/**
- * Returns the meta object for the attribute '{@link ElementCreationMenuModel.CreationMenu#isDisplayAllRoles <em>Display All Roles</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#isDisplayAllRoles <em>Display All Roles</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Display All Roles</em>'.
- * @see ElementCreationMenuModel.CreationMenu#isDisplayAllRoles()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#isDisplayAllRoles()
* @see #getCreationMenu()
* @generated
*/
@@ -351,11 +361,11 @@ public interface ElementCreationMenuModelPackage extends EPackage {
*/
interface Literals {
/**
- * The meta object literal for the '{@link ElementCreationMenuModel.impl.FolderImpl <em>Folder</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.FolderImpl <em>Folder</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see ElementCreationMenuModel.impl.FolderImpl
- * @see ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getFolder()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.FolderImpl
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getFolder()
* @generated
*/
EClass FOLDER = eINSTANCE.getFolder();
@@ -369,11 +379,11 @@ public interface ElementCreationMenuModelPackage extends EPackage {
EReference FOLDER__MENU = eINSTANCE.getFolder_Menu();
/**
- * The meta object literal for the '{@link ElementCreationMenuModel.impl.MenuImpl <em>Menu</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.MenuImpl <em>Menu</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see ElementCreationMenuModel.impl.MenuImpl
- * @see ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getMenu()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.MenuImpl
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getMenu()
* @generated
*/
EClass MENU = eINSTANCE.getMenu();
@@ -395,11 +405,11 @@ public interface ElementCreationMenuModelPackage extends EPackage {
EAttribute MENU__ICON = eINSTANCE.getMenu_Icon();
/**
- * The meta object literal for the '{@link ElementCreationMenuModel.impl.CreationMenuImpl <em>Creation Menu</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.CreationMenuImpl <em>Creation Menu</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see ElementCreationMenuModel.impl.CreationMenuImpl
- * @see ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getCreationMenu()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.CreationMenuImpl
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getCreationMenu()
* @generated
*/
EClass CREATION_MENU = eINSTANCE.getCreationMenu();
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/Folder.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/Folder.java
new file mode 100644
index 00000000000..65f88d84fa9
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/Folder.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Folder</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder#getMenu <em>Menu</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getFolder()
+ * @model
+ * @generated
+ */
+public interface Folder extends Menu {
+ /**
+ * Returns the value of the '<em><b>Menu</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Menu</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Menu</em>' containment reference list.
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getFolder_Menu()
+ * @model containment="true"
+ * @generated
+ */
+ EList<Menu> getMenu();
+
+} // Folder
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/Menu.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/Menu.java
index 90decadf714..8c1f000ee27 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/Menu.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/Menu.java
@@ -1,6 +1,16 @@
/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
-package ElementCreationMenuModel;
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel;
import org.eclipse.emf.ecore.EObject;
@@ -12,12 +22,12 @@ import org.eclipse.emf.ecore.EObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link ElementCreationMenuModel.Menu#getLabel <em>Label</em>}</li>
- * <li>{@link ElementCreationMenuModel.Menu#getIcon <em>Icon</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getLabel <em>Label</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getIcon <em>Icon</em>}</li>
* </ul>
* </p>
*
- * @see ElementCreationMenuModel.ElementCreationMenuModelPackage#getMenu()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getMenu()
* @model abstract="true"
* @generated
*/
@@ -32,14 +42,14 @@ public interface Menu extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Label</em>' attribute.
* @see #setLabel(String)
- * @see ElementCreationMenuModel.ElementCreationMenuModelPackage#getMenu_Label()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getMenu_Label()
* @model required="true" ordered="false"
* @generated
*/
String getLabel();
/**
- * Sets the value of the '{@link ElementCreationMenuModel.Menu#getLabel <em>Label</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getLabel <em>Label</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Label</em>' attribute.
@@ -58,14 +68,14 @@ public interface Menu extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Icon</em>' attribute.
* @see #setIcon(String)
- * @see ElementCreationMenuModel.ElementCreationMenuModelPackage#getMenu_Icon()
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getMenu_Icon()
* @model ordered="false"
* @generated
*/
String getIcon();
/**
- * Sets the value of the '{@link ElementCreationMenuModel.Menu#getIcon <em>Icon</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getIcon <em>Icon</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Icon</em>' attribute.
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/CreationMenuImpl.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/CreationMenuImpl.java
index 3edbf80c1ab..567f56c0cbc 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/CreationMenuImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/CreationMenuImpl.java
@@ -1,9 +1,16 @@
/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
-package ElementCreationMenuModel.impl;
-
-import ElementCreationMenuModel.CreationMenu;
-import ElementCreationMenuModel.ElementCreationMenuModelPackage;
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl;
import org.eclipse.emf.common.notify.Notification;
@@ -11,6 +18,9 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage;
+
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Creation Menu</b></em>'.
@@ -18,9 +28,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link ElementCreationMenuModel.impl.CreationMenuImpl#getElementTypeIdRef <em>Element Type Id Ref</em>}</li>
- * <li>{@link ElementCreationMenuModel.impl.CreationMenuImpl#getRole <em>Role</em>}</li>
- * <li>{@link ElementCreationMenuModel.impl.CreationMenuImpl#isDisplayAllRoles <em>Display All Roles</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.CreationMenuImpl#getElementTypeIdRef <em>Element Type Id Ref</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.CreationMenuImpl#getRole <em>Role</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.CreationMenuImpl#isDisplayAllRoles <em>Display All Roles</em>}</li>
* </ul>
* </p>
*
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/ElementCreationMenuModelFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/ElementCreationMenuModelFactoryImpl.java
index f4d0a21645b..c5f07f5c07a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/ElementCreationMenuModelFactoryImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/ElementCreationMenuModelFactoryImpl.java
@@ -1,14 +1,23 @@
/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
-package ElementCreationMenuModel.impl;
-
-import ElementCreationMenuModel.*;
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.*;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/ElementCreationMenuModelPackageImpl.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/ElementCreationMenuModelPackageImpl.java
index d18c0fde4d5..b05c066088e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/ElementCreationMenuModelPackageImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/ElementCreationMenuModelPackageImpl.java
@@ -1,12 +1,16 @@
/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
-package ElementCreationMenuModel.impl;
-
-import ElementCreationMenuModel.CreationMenu;
-import ElementCreationMenuModel.ElementCreationMenuModelFactory;
-import ElementCreationMenuModel.ElementCreationMenuModelPackage;
-import ElementCreationMenuModel.Folder;
-import ElementCreationMenuModel.Menu;
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -14,6 +18,11 @@ import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelFactory;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu;
/**
* <!-- begin-user-doc -->
@@ -54,7 +63,7 @@ public class ElementCreationMenuModelPackageImpl extends EPackageImpl implements
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.EPackage.Registry
- * @see ElementCreationMenuModel.ElementCreationMenuModelPackage#eNS_URI
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#eNS_URI
* @see #init()
* @generated
*/
@@ -79,7 +88,6 @@ public class ElementCreationMenuModelPackageImpl extends EPackageImpl implements
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
- *
* @generated
*/
@SuppressWarnings("javadoc")
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/FolderImpl.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/FolderImpl.java
index bdc7b6ab5bd..44d526eb922 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/FolderImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/FolderImpl.java
@@ -1,10 +1,16 @@
/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
-package ElementCreationMenuModel.impl;
-
-import ElementCreationMenuModel.ElementCreationMenuModelPackage;
-import ElementCreationMenuModel.Folder;
-import ElementCreationMenuModel.Menu;
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl;
import java.util.Collection;
@@ -18,6 +24,10 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu;
+
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Folder</b></em>'.
@@ -25,7 +35,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link ElementCreationMenuModel.impl.FolderImpl#getMenu <em>Menu</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.FolderImpl#getMenu <em>Menu</em>}</li>
* </ul>
* </p>
*
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/MenuImpl.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/MenuImpl.java
index fb5e48acf44..621786d120f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/impl/MenuImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/MenuImpl.java
@@ -1,9 +1,16 @@
/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
-package ElementCreationMenuModel.impl;
-
-import ElementCreationMenuModel.ElementCreationMenuModelPackage;
-import ElementCreationMenuModel.Menu;
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl;
import org.eclipse.emf.common.notify.Notification;
@@ -12,6 +19,9 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu;
+
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Menu</b></em>'.
@@ -19,8 +29,8 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link ElementCreationMenuModel.impl.MenuImpl#getLabel <em>Label</em>}</li>
- * <li>{@link ElementCreationMenuModel.impl.MenuImpl#getIcon <em>Icon</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.MenuImpl#getLabel <em>Label</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.MenuImpl#getIcon <em>Icon</em>}</li>
* </ul>
* </p>
*
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelAdapterFactory.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelAdapterFactory.java
index c06d05facee..00e13badb97 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelAdapterFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelAdapterFactory.java
@@ -1,8 +1,16 @@
/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
-package ElementCreationMenuModel.util;
-
-import ElementCreationMenuModel.*;
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
@@ -11,12 +19,14 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.*;
+
/**
* <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
* <!-- end-user-doc -->
- * @see ElementCreationMenuModel.ElementCreationMenuModelPackage
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage
* @generated
*/
public class ElementCreationMenuModelAdapterFactory extends AdapterFactoryImpl {
@@ -100,13 +110,13 @@ public class ElementCreationMenuModelAdapterFactory extends AdapterFactoryImpl {
/**
- * Creates a new adapter for an object of class '{@link ElementCreationMenuModel.Folder <em>Folder</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder <em>Folder</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see ElementCreationMenuModel.Folder
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder
* @generated
*/
public Adapter createFolderAdapter() {
@@ -114,13 +124,13 @@ public class ElementCreationMenuModelAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link ElementCreationMenuModel.Menu <em>Menu</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu <em>Menu</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see ElementCreationMenuModel.Menu
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu
* @generated
*/
public Adapter createMenuAdapter() {
@@ -128,13 +138,13 @@ public class ElementCreationMenuModelAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link ElementCreationMenuModel.CreationMenu <em>Creation Menu</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu <em>Creation Menu</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see ElementCreationMenuModel.CreationMenu
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu
* @generated
*/
public Adapter createCreationMenuAdapter() {
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelResourceFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelResourceFactoryImpl.java
index 7d6d3158875..07104b50248 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelResourceFactoryImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelResourceFactoryImpl.java
@@ -1,6 +1,16 @@
/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
-package ElementCreationMenuModel.util;
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util;
import org.eclipse.emf.common.util.URI;
@@ -12,7 +22,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
* <!-- begin-user-doc -->
* The <b>Resource Factory</b> associated with the package.
* <!-- end-user-doc -->
- * @see ElementCreationMenuModel.util.ElementCreationMenuModelResourceImpl
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util.ElementCreationMenuModelResourceImpl
* @generated
*/
public class ElementCreationMenuModelResourceFactoryImpl extends ResourceFactoryImpl {
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelResourceImpl.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelResourceImpl.java
index 47985667673..f2ae3dfb0f1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelResourceImpl.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelResourceImpl.java
@@ -1,6 +1,16 @@
/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
-package ElementCreationMenuModel.util;
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util;
import org.eclipse.emf.common.util.URI;
@@ -10,7 +20,7 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
* <!-- begin-user-doc -->
* The <b>Resource </b> associated with the package.
* <!-- end-user-doc -->
- * @see ElementCreationMenuModel.util.ElementCreationMenuModelResourceFactoryImpl
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util.ElementCreationMenuModelResourceFactoryImpl
* @generated
*/
public class ElementCreationMenuModelResourceImpl extends XMLResourceImpl {
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelSwitch.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelSwitch.java
index f663e13eb37..93af0b3b286 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelSwitch.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelSwitch.java
@@ -1,12 +1,21 @@
/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
-package ElementCreationMenuModel.util;
-
-import ElementCreationMenuModel.*;
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.*;
/**
* <!-- begin-user-doc -->
@@ -18,7 +27,7 @@ import org.eclipse.emf.ecore.util.Switch;
* until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- * @see ElementCreationMenuModel.ElementCreationMenuModelPackage
+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage
* @generated
*/
@SuppressWarnings("javadoc")
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelXMLProcessor.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelXMLProcessor.java
index 23eab3160bd..6fe2215d46f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/ElementCreationMenuModel/util/ElementCreationMenuModelXMLProcessor.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelXMLProcessor.java
@@ -1,8 +1,16 @@
/**
+ * Copyright (c) 2013 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ *
*/
-package ElementCreationMenuModel.util;
-
-import ElementCreationMenuModel.ElementCreationMenuModelPackage;
+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util;
import java.util.Map;
@@ -12,6 +20,8 @@ import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage;
+
/**
* This class contains helper methods to serialize and deserialize XML documents
* <!-- begin-user-doc -->
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF
index 5988a9d598d..4b007830bed 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF
@@ -2,11 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.newchild;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.newchild.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.newchild;bundle-version="0.10.0",
org.eclipse.emf.transaction,
org.eclipse.papyrus.infra.core,
org.eclipse.papyrus.infra.emf,
@@ -16,8 +15,9 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.gmf.runtime.emf.type.core,
org.eclipse.papyrus.infra.services.edit,
org.eclipse.papyrus.infra.tools,
- org.eclipse.papyrus.infra.gmfdiag.commands
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ org.eclipse.papyrus.infra.gmfdiag.commands,
+ org.eclipse.papyrus.infra.newchild;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/DynamicNewChild.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/DynamicNewChild.java
index 56d0769a479..d0ef4b7a9c4 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/DynamicNewChild.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/DynamicNewChild.java
@@ -26,6 +26,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
import org.eclipse.papyrus.infra.newchild.CreationMenuFactory;
import org.eclipse.papyrus.infra.newchild.CreationMenuRegistry;
+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.ISelectionService;
@@ -36,21 +37,21 @@ import org.eclipse.ui.actions.CompoundContributionItem;
import org.eclipse.ui.menus.CommandContributionItem;
import org.eclipse.ui.menus.CommandContributionItemParameter;
-import ElementCreationMenuModel.Folder;
-
/**
* This class has in charge to create menu from elementCreationMenuModel
*
*/
public class DynamicNewChild extends CompoundContributionItem {
- private TransactionalEditingDomain editingDomain;
+ protected TransactionalEditingDomain editingDomain;
+ protected CreationMenuRegistry creationMenuRegistry;
/**
*
* Constructor.
*
*/
public DynamicNewChild() {
+ creationMenuRegistry = new CreationMenuRegistry();
}
/**
@@ -65,15 +66,13 @@ public class DynamicNewChild extends CompoundContributionItem {
protected IContributionItem[] getContributionItems() {
- // TODO Auto-generated method stub
- int size = 2;
+ int size = creationMenuRegistry.getRootFolder().size();
IContributionItem[] list = new IContributionItem[size];
IWorkbench wb = PlatformUI.getWorkbench();
IWorkbenchWindow win = wb.getActiveWorkbenchWindow();
for(int i = 0 ; i< size ; i++){
- //list[i] = new CommandContributionItem(new CommandContributionItemParameter(win, "MenuCommandeId_"+i, "CommandeId_"+i, SWT.None));
list[i] = new CommandContributionItem(new CommandContributionItemParameter(win, "MenuCommandeId_"+i, "CommandeId_"+i, SWT.None));
}
@@ -88,14 +87,7 @@ public class DynamicNewChild extends CompoundContributionItem {
public void fill(Menu menu, int index) {
- // TODO Auto-generated method stub
super.fill(menu, index);
-
- //org.eclipse.swt.widgets.MenuItem topMenuItem = new MenuItem(menu,SWT.CASCADE );
- //topMenuItem.setText("New Child");
- //Menu topMenu=new Menu(menu);
- //topMenuItem.setMenu(topMenu);
- CreationMenuRegistry creationMenuRegistry= new CreationMenuRegistry();
EObject eObject= getSelection();
CreationMenuFactory creationMenuFactory= new CreationMenuFactory(editingDomain);
ArrayList<Folder> folders= creationMenuRegistry.getRootFolder();
diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF
index 79e83bf7a7a..ec87b07512d 100644
--- a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: NewChildTest
Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.test;singleton:=true
-Bundle-Version: 0.10.0.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.infra.newchild.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.newchild;bundle-version="0.10.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ org.eclipse.papyrus.infra.newchild;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5

Back to the top