[Bug 304584] - [Tooling] Implement Workbench-Model-Toolingv20100525-1530

* added elementId for command parameters

3 files changed, 44 insertions, 0 deletions

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 63842cab..f879dfc8 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -53,6 +53,7 @@ public class Messages {
 	public static String CommandEditor_Down;
 	public static String CommandEditor_Add;
 	public static String CommandEditor_Remove;
+	public static String CommandEditor_ParameterId;
 	
 	public static String DirectMenuItemEditor_Label;
 	public static String DirectMenuItemEditor_Description;
@@ -306,6 +307,8 @@ public class Messages {
 	public static String ContributionClassDialog_DialogTitle;
 	public static String ContributionClassDialog_Label_Classname;
 	public static String ContributionClassDialog_ShellTitle;
+
+	
 	
 	
 	static {
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 78ac0a14..4e9558a9 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -48,6 +48,7 @@ CommandEditor_Up=Up
 CommandEditor_Down=Down
 CommandEditor_Add=Add ...
 CommandEditor_Remove=Remove
+CommandEditor_ParameterId=Id
 
 DirectMenuItemEditor_Label=DirectMenuItem
 DirectMenuItemEditor_Description=DirectMenuItem bla bla bla
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index d22f35d8..9f0ad33d 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -161,6 +161,46 @@ public class CommandEditor extends AbstractComponentEditor {
 			viewer.getControl().setLayoutData(gd);
 
 			{
+				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID);
+				
+				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
+				column.getColumn().setText(Messages.CommandEditor_ParameterId);
+				column.getColumn().setWidth(200);
+				column.setLabelProvider(new ObservableColumnLabelProvider<MCommandParameter>(prop.observeDetail(cp.getKnownElements())));
+				column.setEditingSupport(new EditingSupport(viewer) {
+					private TextCellEditor editor = new TextCellEditor(viewer.getTable());
+					
+					@Override
+					protected void setValue(Object element, Object value) {
+						if( value.toString().trim().length() == 0 ) {
+							value = null;
+						}
+						
+						Command cmd = SetCommand.create(getEditingDomain(), element, ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__ELEMENT_ID, value);
+						if( cmd.canExecute() ) {
+							getEditingDomain().getCommandStack().execute(cmd);
+						}
+					}
+					
+					@Override
+					protected Object getValue(Object element) {
+						MCommandParameter obj = (MCommandParameter) element;
+						return obj.getElementId() != null ? obj.getElementId() : ""; //$NON-NLS-1$
+					}
+					
+					@Override
+					protected CellEditor getCellEditor(Object element) {
+						return editor;
+					}
+					
+					@Override
+					protected boolean canEdit(Object element) {
+						return true;
+					}
+				});
+			}
+			
+			{
 				IEMFValueProperty prop = EMFEditProperties.value(getEditingDomain(), CommandsPackageImpl.Literals.COMMAND_PARAMETER__NAME);
 				
 				TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);