Bug 487933 - [Extra][SysML 1.1] Extra plu-gins shouldn't depend on Sysml

 - correct wrong documentation in effb
 - change name properties in EASTADL
 - remove unused import in req
 - remove wrong comment in Soaml

Change-Id: I9052d33ce5208952fe79c2e42fc2491934b3aa6f
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

7 files changed, 137 insertions, 137 deletions

diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/src/org/eclipse/papyrus/eastadl/nattable/allocation/config/handler/CreateFunctionAllocationHandler.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/src/org/eclipse/papyrus/eastadl/nattable/allocation/config/handler/CreateFunctionAllocationHandler.java
index f1ebd03f936..231cff2734b 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/src/org/eclipse/papyrus/eastadl/nattable/allocation/config/handler/CreateFunctionAllocationHandler.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/src/org/eclipse/papyrus/eastadl/nattable/allocation/config/handler/CreateFunctionAllocationHandler.java
@@ -1,40 +1,40 @@
-/**

- *

- */

-package org.eclipse.papyrus.eastadl.nattable.allocation.config.handler;

-

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.eastadl.nattable.menu.handlers.FunctionAllocationHandler;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.INattableModelManagerUtils;

-

-public class CreateFunctionAllocationHandler extends FunctionAllocationHandler {

-

-	/**

-	 * the id used for the Papyrus SysML Allocation Table

-	 */

-	public static final String TABLE_ALLOCATION_TYPE = "EAST-ADLFunctionAllocationTable"; //$NON-NLS-1$

-

-	/**

-	 *

-	 * @see org.eclipse.papyrus.sysml.nattable.menu.handlers.AbstractSysmlNattableCreateCommandHandler#setEnabled(java.lang.Object)

-	 *

-	 * @param evaluationContext

-	 */

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		Command command = getCommand();

-		boolean isEnabled = command.canExecute();

-		INattableModelManager tableManager = INattableModelManagerUtils.getTableManagerFromWorkbenchPart(getActiveWorkbenchPart());

-		isEnabled = isEnabled && tableManager.getTable().getTableConfiguration().getType().equals(TABLE_ALLOCATION_TYPE);

-		if (isEnabled) {

-			IElementType newElementType = getElementTypeToCreate();

-			String id = newElementType.getId();

-			isEnabled = tableManager.canCreateRowElement(id);

-		}

-		setBaseEnabled(isEnabled);

-

-	}

-

+/**
+ *
+ */
+package org.eclipse.papyrus.eastadl.nattable.allocation.config.handler;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.eastadl.nattable.menu.handlers.FunctionAllocationHandler;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.INattableModelManagerUtils;
+
+public class CreateFunctionAllocationHandler extends FunctionAllocationHandler {
+
+	/**
+	 * the id used for the Papyrus Eastadl Allocation Table
+	 */
+	public static final String TABLE_ALLOCATION_TYPE = "EAST-ADLFunctionAllocationTable"; //$NON-NLS-1$
+
+	/**
+	 *
+	 * 
+	 *
+	 * @param evaluationContext
+	 */
+	@Override
+	public void setEnabled(Object evaluationContext) {
+		Command command = getCommand();
+		boolean isEnabled = command.canExecute();
+		INattableModelManager tableManager = INattableModelManagerUtils.getTableManagerFromWorkbenchPart(getActiveWorkbenchPart());
+		isEnabled = isEnabled && tableManager.getTable().getTableConfiguration().getType().equals(TABLE_ALLOCATION_TYPE);
+		if (isEnabled) {
+			IElementType newElementType = getElementTypeToCreate();
+			String id = newElementType.getId();
+			isEnabled = tableManager.canCreateRowElement(id);
+		}
+		setBaseEnabled(isEnabled);
+
+	}
+
 }
\ No newline at end of file
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/OSGI-INF/l10n/bundle.properties b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/OSGI-INF/l10n/bundle.properties
index 0c50729b30a..d3171fb0616 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/OSGI-INF/l10n/bundle.properties
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.allocation

-Bundle-Vendor = Eclipse Modeling Project

+#Properties file for org.eclipse.papyrus.eastadl.nattable.allocation
+Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = Eastadl FunctionAllocation Table (Incubation)
\ No newline at end of file
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/icons/table_SysML_Allocation_new.png b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/icons/table_Eastadl_Allocation_new.png
index fc8ff255e1a..fc8ff255e1a 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/icons/table_SysML_Allocation_new.png
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/icons/table_Eastadl_Allocation_new.png
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/plugin.xml b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/plugin.xml
index ee16660e1e5..1d5f5df50bc 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/plugin.xml
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation/plugin.xml
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.ui.commands">

-      <command

-            categoryId="org.eclipse.papyrus.editor.category"

-            description="Create a EastAdl FunctionAllocation NatTable Editor"

-            id="org.eclipse.papyrus.eastadl.nattable.allocation.create.command"

-            name="Create a new FunctionAllocation Table">

-      </command>

-   </extension>

-   <extension

-         point="org.eclipse.ui.commandImages">

-      <image

-            commandId="org.eclipse.papyrus.eastadl.nattable.allocation.create.command"

-            icon="icons/table_SysML_Allocation_new.png">

-      </image>

-   </extension>

-   <extension

-         point="org.eclipse.ui.handlers">

-      <handler

-            commandId="org.eclipse.papyrus.eastadl.nattable.allocation.create.command">

-         <activeWhen>

-            <or>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </or>

-         </activeWhen>

-         <class

-               class="org.eclipse.papyrus.infra.nattable.common.handlers.CreateNatTableEditorHandler">

-            <parameter

-                  name="tableType"

-                  value="EAST-ADLFunctionAllocationTable">

-            </parameter>

-         </class>

-      </handler>

-   </extension>

-   <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            allPopups="false"

-            locationURI="popup:org.eclipse.papyrus.infra.nattable.popupmenu.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.eastadl.nattable.allocation.create.command"

-               style="push">

-         </command>

-      </menuContribution>

-      <menuContribution

-            allPopups="false"

-            locationURI="menu:org.eclipse.papyrus.infra.nattable.menu.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.eastadl.nattable.allocation.create.command"

-               style="push">

-         </command>

-      </menuContribution>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            description="Create a EastAdl FunctionAllocation NatTable Editor"
+            id="org.eclipse.papyrus.eastadl.nattable.allocation.create.command"
+            name="Create a new FunctionAllocation Table">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commandImages">
+      <image
+            commandId="org.eclipse.papyrus.eastadl.nattable.allocation.create.command"
+            icon="icons/table_Eastadl_Allocation_new.png">
+      </image>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            commandId="org.eclipse.papyrus.eastadl.nattable.allocation.create.command">
+         <activeWhen>
+            <or>
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">
+                  </equals>
+               </with>
+            </or>
+         </activeWhen>
+         <class
+               class="org.eclipse.papyrus.infra.nattable.common.handlers.CreateNatTableEditorHandler">
+            <parameter
+                  name="tableType"
+                  value="EAST-ADLFunctionAllocationTable">
+            </parameter>
+         </class>
+      </handler>
+   </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:org.eclipse.papyrus.infra.nattable.popupmenu.createnattable">
+         <command
+               commandId="org.eclipse.papyrus.eastadl.nattable.allocation.create.command"
+               style="push">
+         </command>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="menu:org.eclipse.papyrus.infra.nattable.menu.createnattable">
+         <command
+               commandId="org.eclipse.papyrus.eastadl.nattable.allocation.create.command"
+               style="push">
+         </command>
+      </menuContribution>
+   </extension>
+
+</plugin>
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/OSGI-INF/l10n/bundle.properties b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/OSGI-INF/l10n/bundle.properties
index 0e3374a8431..94e51153353 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/OSGI-INF/l10n/bundle.properties
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.menu

-Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = Menu for the creation of Sysml elements in the tabular editor (Incubation)
\ No newline at end of file
+#Properties file for org.eclipse.papyrus.eastadl.nattable.menu
+Bundle-Vendor = Eclipse Modeling Project
+Bundle-Name = Menu for the creation of eastadl elements in the tabular editor (Incubation)
\ No newline at end of file
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/src/org/eclipse/papyrus/eastadl/service/types/elements/EastadlElementTypes.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/src/org/eclipse/papyrus/eastadl/service/types/elements/EastadlElementTypes.java
index f1bc0e70518..ca80dbe5221 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/src/org/eclipse/papyrus/eastadl/service/types/elements/EastadlElementTypes.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/src/org/eclipse/papyrus/eastadl/service/types/elements/EastadlElementTypes.java
@@ -1,13 +1,13 @@
-package org.eclipse.papyrus.eastadl.service.types.elements;

-

-import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;

-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

-

-public class EastadlElementTypes extends AbstractElementTypeEnumerator {

-

-	/** Constant for SysML nature */

-	public static final String SYSML_NATURE = "East-adl_Nature";

-

-	/** IElementType for SysML Allocate */

-	public static final IHintedType FUNCTION_ALLOCATE = (IHintedType) getElementType("org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation"); //$NON-NLS-1$

-}

+package org.eclipse.papyrus.eastadl.service.types.elements;
+
+import org.eclipse.gmf.runtime.emf.type.core.AbstractElementTypeEnumerator;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+
+public class EastadlElementTypes extends AbstractElementTypeEnumerator {
+
+	/** Constant for EASTADL nature */
+	public static final String EASTADL_NATURE = "East-adl_Nature";
+
+	/** IElementType for EASTADL Allocate */
+	public static final IHintedType FUNCTION_ALLOCATE = (IHintedType) getElementType("org.eclipse.papyrus.eastadl.structure.functionmodeling.FunctionAllocation"); //$NON-NLS-1$
+}
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/src/org/eclipse/papyrus/eastadl/service/types/menu/AbstractCreateEastadlChildMenu.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/src/org/eclipse/papyrus/eastadl/service/types/menu/AbstractCreateEastadlChildMenu.java
index c3141aa0c8f..a999288ce45 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/src/org/eclipse/papyrus/eastadl/service/types/menu/AbstractCreateEastadlChildMenu.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/src/org/eclipse/papyrus/eastadl/service/types/menu/AbstractCreateEastadlChildMenu.java
@@ -1,17 +1,17 @@
-package org.eclipse.papyrus.eastadl.service.types.menu;

-

-import org.eclipse.papyrus.infra.ui.util.AbstractCreateMenuFromCommandCategory;

-

-public class AbstractCreateEastadlChildMenu extends AbstractCreateMenuFromCommandCategory {

-

-	/** the cateogory of the command used to create SysML elements */

-	public static final String SYSML_CREATION_COMMAND_CATEGORY = "org.eclipse.papyrus.eastadl.service.types.eastadlElementCreationCommands"; //$NON-NLS-1$

-

-	/**

-	 * Constructor.

-	 *

-	 */

-	public AbstractCreateEastadlChildMenu() {

-		super(SYSML_CREATION_COMMAND_CATEGORY);

-	}

-}

+package org.eclipse.papyrus.eastadl.service.types.menu;
+
+import org.eclipse.papyrus.infra.ui.util.AbstractCreateMenuFromCommandCategory;
+
+public class AbstractCreateEastadlChildMenu extends AbstractCreateMenuFromCommandCategory {
+
+	/** the cateogory of the command used to create EASTADL elements */
+	public static final String EASTADL_CREATION_COMMAND_CATEGORY = "org.eclipse.papyrus.eastadl.service.types.eastadlElementCreationCommands"; //$NON-NLS-1$
+
+	/**
+	 * Constructor.
+	 *
+	 */
+	public AbstractCreateEastadlChildMenu() {
+		super(EASTADL_CREATION_COMMAND_CATEGORY);
+	}
+}